make it colorful
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/eddy/program.rb
Merge pull request #5 from jimmyqian/master

colors