Final changes
Merge branch 'master' of https://github.com/291Project1/291Project1