reverting to previous setup for Knex as there were issues with access from outside app
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp

Conflicts:
	server/server.js
Merge pull request #62 from suprbh/master

reverting to previous setup for Knex