First bootstrap and frontend
Merge branch 'master' of https://github.com/javimudi/node-flight-test

Conflicts:
	bot/app.js