rehash
Merge branch 'master' of https://github.com/MakeMD/Comers

Conflicts:
	project.properties