vues des maisons
Merge branch 'views/houses' of https://github.com/NathanChalot/hoster

Conflicts:
	app/views/houses/edit.html.erb
	app/views/houses/show.html.erb