I made no changes
Merge branch 'master' of https://github.com/WarrenGreen/petulant-hipster

Conflicts:
	bin/classes.dex
	bin/petulant-hipster.apk
	bin/resources.ap_