Attempts travis CI with after_success.sh
Uses deploy method for travis CI
Merge pull request #59 from kmeurer/master

Remove app.js from root folder
Merge pull request #60 from jamesongamble/master

Add new encrypted token for Travis
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
add routing for mobile app. Can now be found at /mobile.