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

Endofsprint
removed conflict
Merge pull request #22 from KodeIV/natsnewbranch

removed conflict
KODEIV.github