Fix test file, fix contrib module, add megaman tiles
Fix PEP8 issues with core and app modules
Also added test map
Merge branch 'master' of github.com:2nickpick/jax-group-project into entities

Conflicts:
	app/test.py
initial changes for simple physics and collision
Merge pull request #7 from 2nickpick/stephen-core

merge stephen-core