last push
Merge branch 'master' of https://github.com/wque/burningairlines

Conflicts:
	app/views/pages/index.html.erb