Added placeholder footsteps and weapon sounds.
Merge branch 'Sounds' of https://github.com/ProfAmesBC/Game2013.git into
Sounds
Added Game Sounds
Merge branch 'Sounds' of https://github.com/ProfAmesBC/Game2013.git into
Sounds

Conflicts:
	src/game/PlayerMotion.java
Merge branch 'Sounds' of https://github.com/ProfAmesBC/Game2013.git into
Sounds

Conflicts:
	src/game/PlayerMotion.java
Attempt to restore git
Test Commit 2
edited a footstep wav file to be added when the player moves
Merge branch 'Sounds' of https://github.com/ProfAmesBC/Game2013.git into
Sounds

Conflicts:
	src/game/PlayerMotion.java
	src/weapons/WeaponSounds.java
Merge branch 'master' of local repository into Sounds
Adjusted sound naming conventions
Added additional placeholder sound effects
Fixed double movement
Merge branch 'master' of local repository into Sounds
Merge branch 'master' into Sounds

Conflicts:
	src/game/PlayerMotion.java
Merge branch 'Sounds' of https://github.com/ProfAmesBC/Game2013.git into Sounds
Merge branch 'Sounds' of https://github.com/ProfAmesBC/Game2013.git into Sounds
Merge branch 'Sounds' of https://github.com/ProfAmesBC/Game2013.git into Sounds
Added weapon change sound placeholders
Merge branch 'master' into Sounds

Conflicts:
	src/game/PlayerMotion.java