fixes
Merge branch 'master' of https://github.com/TeamTreehouseGroup/Our-First-Project