almost last commit
Merge branch 'master' of https://github.com/MethactonHackers/PebblePanicC

Conflicts:
	android/bin/classes.dex
	android/bin/classes/com/sagapps/pebblepaniccomp/MainActivity$1.class
	android/bin/classes/com/sagapps/pebblepaniccomp/MainActivity$2.class
	android/bin/classes/com/sagapps/pebblepaniccomp/MainActivity$3.class
	android/bin/classes/com/sagapps/pebblepaniccomp/MainActivity$4.class
	android/bin/classes/com/sagapps/pebblepaniccomp/MainActivity.class
	android/bin/classes/com/sagapps/pebblepaniccomp/R$dimen.class
	android/bin/classes/com/sagapps/pebblepaniccomp/R$layout.class
	android/bin/classes/com/sagapps/pebblepaniccomp/R$menu.class
	android/bin/classes/com/sagapps/pebblepaniccomp/R$string.class
	android/bin/classes/com/sagapps/pebblepaniccomp/R$style.class
	android/bin/resources.ap_
	android/src/com/sagapps/pebblepaniccomp/MainActivity.java