whitespace
Merge pull request #63 from calblueprint/varun/fix-routes

whitespace
Merge branch 'master' of github.com:calblueprint/worldreader into jdu/user_auth
merge conflict
friggin merge conflicts