ds store deletion
Merge branch 'master' of https://github.com/TuxCraft/WorldChangers

Conflicts:
	.DS_Store
	assets/.DS_Store
fixed a few errors