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

Conflicts:
	project.properties