I dont think i did anything
Merge branch 'master' of https://github.com/EricSeverson/HackPoly

Conflicts:
	bin/classes/com/example/hackpoly/R$id.class
	bin/classes/com/example/hackpoly/R$layout.class
	bin/classes/com/example/hackpoly/R$menu.class
	bin/classes/com/example/hackpoly/R$string.class
	bin/classes/com/example/hackpoly/R$style.class