style changes
Merge branch 'master' of github.com:jimpo/lazertag
style changes