derek

derek
Merge branch 'master' of https://github.com/COMS319/Project

Conflicts:
	Derek/Project/.classpath
	Derek/Project/bin/classes/.gitignore
	Derek/Project/gen/.gitignore
	Derek/Project/src/com/example/project/MainActivity.java