Some more codez
Merge branch 'master' of https://github.com/jacobhanshaw/Sniper

Conflicts:
	android/src/com/sniper/ActivityNewGame.java
	android/src/com/sniper/core/Game.java