Add ionic mobile project back to germTheoryWeb repo
Merge pull request #54 from ryojiosawa/mobile

Add ionic mobile project back to germTheoryWeb repo
Merge pull request #56 from suprbh/master

Restructured use of Knex
Remove app.js file and refactor into server.js
Altered procfile for new setup.
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
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp

Conflicts:
	server/server.js