modified project properties
Merge branch 'master' of github.com:elioht/CalHacks

Conflicts:
	project.properties