update
Merge branch 'master' of github.com:Elioht/CalHacks

Conflicts:
	project.properties
	src/com/unsigned/innovations/CalHacks/MainActivity.java