pulled
a
Merge branch 'master' of https://github.com/twendlandt/Assignment1

Conflicts:
	bin/Assigment1.apk
	bin/classes.dex
	bin/classes/com/example/assigment1draft/ClickerActivity$4.class
	bin/classes/com/example/assigment1draft/MainActivity$1.class
	bin/resources.ap_
removed clickerview