Working through conflicts
Merge branch 'master' of https://github.com/CharlieMouton/FE_Final_Project