update from BiRG
Merge branch 'master' of github.com:DaManDOH/WSU-CS-3180

Conflicts:
	Submissions/Fall 2013/___grading.txt