Schema something or other
Merge branch 'master' of https://github.com/mkmartins/bus

Conflicts:
	db/schema.rb
Keeps the master branch
Links email to contact us form