Addition of hotel-api.js to deployment
gitignore
changed .gitignore
Extra variable in app.js
Merge branch 'master' into deployment

Conflicts:
	.gitignore

.gitignore changed
add configurable api keys that aren\'t set in github