added colors
maerge
Merge branch 'master' of github.com:spsnow/Syllabliss