colours and buttons now work
resolved conflicts
Merge pull request #21 from KodeIV/endofsprint

Endofsprint