pushing all of the changes for the night.

Will finish more of the staff logic tomorrow
Merge branch 'master' of https://github.com/joubin/CSC191

Merging