test
ignore .project
Merge branch 'master' of https://github.com/arnabold/mashing

Conflicts:
	headfirst/lounge/.project
	headfirst/starbuzz/.project
placeholder
try
Merge branch 'master' of https://github.com/arnabold/mashing

boh