just pulling
Merge branch 'master' of https://github.com/IcyVines/Whack-A-Zack

Conflicts:
	bin/classes/com/example/whack_a_zack/MainActivity$PlaceholderFragment.class
	bin/classes/com/example/whack_a_zack/MainActivity.class
	bin/classes/com/example/whack_a_zack/R$id.class
	bin/classes/com/example/whack_a_zack/R$layout.class
	bin/classes/com/example/whack_a_zack/R$menu.class
	bin/classes/com/example/whack_a_zack/R$string.class
	bin/classes/com/example/whack_a_zack/R$style.class
	gen/com/example/whack_a_zack/R.java
	res/layout/activity_main.xml
fixed images and removed bin/