Revert 3eff98c..f0a06ae

This rolls back to commit 3eff98c98b2bbcf1991ef336127cb4f943a7bd04.
Merge branch 'master' of https://github.com/WarrenGreen/petulant-hipster

Conflicts:
	bin/classes/com/example/petulant_hipster/MainActivity.class
	src/com/example/petulant_hipster/MainActivity.java