Updated a few things
Merge branch 'master' of git@github.com:bjarkehs/cs_440_mp4.git