creating new branch, making it up to date
removed newController.js and the whole new presentaur page
removed old, unused templates
File cleanup, socket bug fix, and DJ controller design work hopefully for mobile(?)
Merge branch 'master' into timing
Merge pull request #73 from KyleW/timing

Refactors and stuff I need to test on heroku specifically.