page principale
Merge branch 'master' of https://github.com/namlluks/VIP

Conflicts:
	app/views/bars/index.html.erb
	db/schema.rb
Merge branch 'master' of https://github.com/namlluks/VIP

Conflicts:
	db/schema.rb