Merge branch 'evaluation'
Merge branch 'Parker'
Sound Controller

Not much work done, just some code adjustment. Its open for review and
suggestions, since i doubt what i did was correct
Merge branch 'master' into evaluation

Conflicts:
	CSE455-Salvage.userprefs