I have no idea what it wants :(
Merge branch 'master' of github.com:danielw93/BaconGameJam06

Conflicts:
	main.py
	player.py

nobody knows