Set up repository
Merge branch 'master' of github.com:murphyslaw480/platformer4x4

Conflicts:
	.gitignore
	README.md