Revert "Merge branch 'master' of github.com:tylerweidel/CEG-4110"

This reverts commit 7b168502c65bd5a4d3ff7903f5b7226251e352d9, reversing
changes made to 85d8ba9cb0d33a6fcb3a5b5d545a7be856e31653.