Merge pull request #25 from JoshLankford/master

new routes & knex config change
Add user information fields