Merge pull request #10 from martinchenu/improve-flat-listing-view

Improve flat listing view
ajout de la gem rails 12 factor sur le master
ajout de la gem rails 12 factor sur le master
ajout du procfile
Merge branch 'master' of github.com:martinchenu/airbnc

Conflicts:
	Gemfile
bug fix au niveau du model booking belongs to
Database configuration
Ruby 2.0.0 and Webrick by default
fixing bug
fixing bug
fixing bug
simple booking system
Resolved conflicts
Solved
Merge pull request #11 from martinchenu/add_status_to_booking

simple booking system
merge improve-flat-listing-view