Delete project.properties
Merge branch 'master' of https://github.com/hellocountryman/test.git

Conflicts:
	project.properties