sf
Merge branch 'dev' of https://github.com/MAVG-Programmers/BaconGameJam08 into dev

Conflicts:
	js/Ball.js
	js/ItemBox.js
	js/Items.js
	js/Main.js