Merge branch 'master' of git://github.com/ndhoule/dott
colors
Merge branch 'master' of git://github.com/ndhoule/dott
Merge pull request #4 from kwalker3690/master

colors and stuff