Merge pull request #10 from HackSocNotts/master

Accidental push onto master fix
Testing of colour schemes
Merge pull request #11 from HackSocNotts/dev

Testing of colour schemes