Revert 846c03b..11f2e68

This rolls back to commit 846c03bc91b85fdce16ee1f4e1d2118593898ec8.
Revert d4aaa4a..69701a8

This rolls back to commit d4aaa4a9cc9de8b618e5d47dfc14a528d456b95a.
Merge branch 'master' of https://github.com/kuykendall-benjamin/School-Project-KNKG