Added colors
Merge branch 'master' of https://github.com/juesato/pennApps14