add column price to houses
ok price
Merge pull request #10 from NathanChalot/addprice

Addprice
affichage des users
Merge pull request #11 from NathanChalot/views/reservations

affichage des users
adding link to house et review
Merge pull request #12 from NathanChalot/addlinktohouse

adding link to house et review
prices everywheeeeere
Merge pull request #13 from NathanChalot/Adding-prices-everywhere

prices everywheeeeere
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
add link publish announce et suppr navbar dans view landing
ok sign in
Merge pull request #16 from NathanChalot/activehome

Activehome
affichage lien fb
new update of nav-fb
update two