Fix collision detection
Merge branch 'master' of https://github.com/mschneider90/SeniorProject

Conflicts:
	game/uart/mooseboxgame.v12.suo
	game/uart/mooseboxgame/bin/Debug/mooseboxgame.exe
Merge branch 'master' of https://github.com/mschneider90/SeniorProject

Conflicts:
	game/uart/mooseboxgame.v12.suo
	game/uart/mooseboxgame/bin/Debug/mooseboxgame.exe
Fix menu timeout