idk what i did
Merge branch 'master' of github.com:jimpo/lazertag
fixing colors
Merge branch 'master' of github.com:jimpo/lazertag