Rebuilt app
Merge branch 'master' of https://github.com/PqBenoit/ptp

Conflicts:
	.DS_Store
	.gitignore
	Gemfile
	Gemfile.lock
	Rakefile
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/assets/stylesheets/bars.css.scss
	app/assets/stylesheets/common.css.scss
	app/controllers/bars_controller.rb
	app/helpers/application_helper.rb
	app/helpers/bars_helper.rb
	app/models/bar.rb
	app/views/bars/_form.html.erb
	app/views/bars/index.html.erb
	app/views/bars/show.html.erb
	app/views/devise/sessions/new.html.erb
	app/views/devise/shared/_links.erb
	app/views/layouts/application.html.erb
	config.ru
	config/application.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/devise.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/locales/devise.en.yml
	config/routes.rb
	db/schema.rb
	test/fixtures/bars.yml
	test/functional/bars_controller_test.rb