initial commit
Merge branch 'master' of https://github.com/namyxc/CollectCheese

Conflicts:
	.classpath
	.project