Initial commit
Procfile for heroku
Merge branch 'develop'

Conflicts:
	.gitignore
package.json file
using Port 80
Added NODE_ENV param
Updated the server.js file
Merge branch 'develop' of https://github.com/mormsby/meditrip into develop
Merge branch 'master' into develop