Added pretty colors --ADJ
Merge branch 'master' of https://github.com/donaldheer/TekScholar2014Client