disposal
Merge branch 'master' of https://github.com/BerGer23/max-this-hour.git

Conflicts:
	max-this-hour-android/bin/classes.dex
	max-this-hour-android/bin/classes/com/bk/maxthishour/MainActivity.class
	max-this-hour-android/bin/max-this-hour-android.apk
	max-this-hour-android/bin/resources.ap_
	max-this-hour-android/src/com/bk/maxthishour/MainActivity.java
	max-this-hour/src/com/bk/maxthishour/mthGUI.java