need to push to pull.
cant seem to pull
Merge branch 'master' of https://github.com/jykoko/HackFSU.git

Conflicts:
	HackFSU/.classpath
	HackFSU/bin/HackFSU.apk
	HackFSU/bin/classes.dex
	HackFSU/bin/resources.ap_