did everything mentioned in email
Merge branch 'master' of https://github.com/sfrink/CSC210-Project