Merge branch 'evaluation' into Aaron-Flores
Merge branch 'evaluation' into Joseph-Allison
Merge branch 'evaluation'
Merge branch 'evaluation' into Aaron-Flores
Merge branch 'evaluation' into Joseph-Allison
Merge branch 'Parker' into Aaron-Flores
Merge branch 'Parker' into Joseph-Allison
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 'Aaron-Flores' into evaluation
Merge branch 'Aaron-Flores' into evaluation
Merge branch 'Jared-Johnson' into evaluation
Merge branch 'Joseph-Allison' into evaluation
Marques into Evaluation

Committing only marques script
Merge branch 'master' into evaluation

Conflicts:
	CSE455-Salvage.userprefs
Merge branch 'evaluation' into Jared-Johnson