Added conversion of position values + improved shot detection
Merge branch 'master' of github.com:Informaticore/blocks

Conflicts:
	app/src/main/java/com/dudes/android/blocks/MainActivity.java