Merge branch 'master' of https://github.com/cmester0/CakeWorld

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/cmester0/CakeWorld