Hope this fixed the errors
Merge branch 'master' of https://github.com/mikephe/cs151Project