schema
Merge branch 'master' of https://github.com/juliendebray/airbnb

Conflicts:
	db/schema.rb