i keep getting erros
Merge branch 'uclick1.1' of https://github.com/LalaP/BrainTeasers into uclick1.1

Conflicts:
	UClick/bin/UClick.apk
	UClick/bin/classes.dex
	UClick/bin/classes/com/cs365/uclick/ClickerActivity.class
	UClick/bin/resources.ap_