test
Merge branch 'master' of https://github.com/mborjesson/GameJam-1.0.git

Conflicts:
	README.md