small changes
reverting
Merge branch 'master' of heroku.com:hackmitproject
Testing routing options
Fixing merge