Merge branch 'master' into feature/stash_indicator

Conflicts:
	prompt.bash
	test

1 files changed, 3 insertions, 1 deletions

diff --git a/test b/test
index d5213be..54a3aa2 100755
--- a/test
+++ b/test
@@ -1,8 +1,10 @@
 #!/bin/sh
 
+./test-radar-base.sh
 ./test-directories.sh
 ./test-commits.sh
 ./test-branches.sh
 ./test-files.sh
 ./test-status.sh
-./test-stash.sh
\ No newline at end of file
+./test-stash.sh
+./test-colors.sh