Edited colours and function shortening
Merge branch 'master' of https://github.com/eohomegrownapps/wikiquiz.git