Merged with master.
Merge branch 'master' of https://github.com/NintenJoe/cs411-project