Spaces at the end of lines
Merge branch 'master' of github.com:raphaelescoyez/arbnb

Conflicts:
	app/controllers/flatpictures_controller.rb
	app/models/availability.rb
	app/models/user.rb
	config/routes.rb
	db/schema.rb