fixes
Merge branch 'master' of https://github.com/umwood89/4350-group-awesome-repo.git