Test commit Ray
Merge branch 'master' of https://github.com/GlenDC/HitPlayJam

Conflicts:
	the-salmon-factory-android/bin/classes.dex
	the-salmon-factory-android/bin/resources.ap_
	the-salmon-factory-android/bin/the-salmon-factory-android.apk