added stuff from handin
Merge branch 'master' of https://github.com/czhu12/cs311-312