Merge pull request #76 from nolanfilter/JimmyJam

Jimmy jam
Added Routine enum
Refactored Routines and TeachingControllers
Merge pull request #77 from nolanfilter/Nolan

Added Routine enum
Merge branch 'master' of https://github.com/nolanfilter/ProjectDeath into JimmyJam