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