Trying to fix the branching issues.
Merge branch 'master' of github.com:CharlieMouton/FE_Final_Project