First commit, recommend all team members pull and clone the repo
Merge branch 'master' of https://github.com/technoman316/FinalProject.git