derp
Merge branch 'windowsisstupid' of github.com:DeltaWhy/DroidJam

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml