do not track this file
Merge branch 'master' of https://github.com/Codepath-THC/tenderloin_housing

Conflicts:
	project.properties