routes and schema
resolving merge conflicts
schema
Merge branch 'master' of github.com:jalant/StoopApplication