Fix mistakes
Merge branch 'master' of github.com:namoscato/cs1573-team-project