old
Merge branch 'master' of github.com:danielw93/BaconGameJam06

Conflicts:
	main.py
	player.py
still working on collision