Refactoring!!!!

Restarting Saves the Day!!
Conflicts
Merge branch 'master' of https://github.com/HigherLevelGames/CeCePsyche