creating new branch, making it up to date
removed newController.js and the whole new presentaur page
removed old, unused templates
signup page styling
merge conflict resolved
Merge pull request #71 from KyleW/signuppage

Sign up page styling
Merge pull request #72 from KyleW/auth

adjusting favicon
styling: added footer
added favicon tag to index.html
added favicon tag to index.html
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.
Merge branch 'master' of https://github.com/KyleW/presentaur
favicon tweaks
styling
Merge branch 'master' into styling
Merge pull request #74 from KyleW/styling

Styling
Merge branch 'master' of https://github.com/KyleW/presentaur
Merge branch 'master' into auth