Revert "Merge branch 'Dev' of https://github.com/dkley/Project1-315 into Dev"

This reverts commit f02d2c82e8cba56b24724d415b73a4497d2567c6, reversing
changes made to 1079fc8eef7f5a1b9bed78abd32e35ef44aec849.