commit
map finally working!!!
map works
Merge branch 'master' of https://github.com/thirab/y-hack-red-zones

Conflicts:
	RedZones/bin/RedZones.apk
	RedZones/bin/classes.dex
	RedZones/bin/classes/com/example/redzones/MainActivity.class
	RedZones/bin/resources.ap_
	RedZones/project.properties
	RedZones/res/layout/activity_main.xml
	RedZones/src/com/example/redzones/MainActivity.java