resync
Revert "resync"

This reverts commit ce08beabd71e9d1b4782c30d8f94f8ba60597d49.
resync
Merge branch 'master' of https://github.com/bbroders99/final_project_v8