changed routes to match views
some cleanups
Merge branch 'master' of https://github.com/vgupta0/cs147-final