Fixed my missing colon. (oops)
Merge branch 'master' of github.com:NintenJoe/cs411-project