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

Conflicts:
	src/com/greylocku/lazer/GameActivity.java