made a few changes
Merge branch 'master' of https://github.com/jschear/cs1951a-final

merged branches