Merged Routes, fixed some bugs, working OOP
Merge branch 'master' of github.com:wspurgin/NightKnights
automerge