Merge branch 'Sounds' of https://github.com/ProfAmesBC/Game2013.git into
Sounds

Conflicts:
	src/game/PlayerMotion.java
Attempt to restore git