Design
Merge branch 'master' of https://github.com/jartek/airbnbclone

Conflicts:
	app/controllers/dashboard_controller.rb
	app/views/dashboard/index.html.erb
	app/views/properties/index.html.erb
	log/development.log
Design