.
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