Updated color scheme
Merge branch 'master' of https://github.com/Frozenfire92/SMU-Hack-A-Week-2014