conflict test
Merge branch 'master' of https://github.com/joePasz/bar-website

Conflicts:
	bar-website-rails/Gemfile~
	bar-website-rails/app/views/layouts/application.html.erb
	bar-website-rails/app/views/layouts/application.html.erb~
	bar-website-rails/config/initializers/devise.rb
	bar-website-rails/config/routes.rb~
	bar-website-rails/db/schema.rb
Merge branch 'master' of https://github.com/joePasz/bar-website

Conflicts:
	bar-website-rails/app/views/layouts/application.html.erb
	bar-website-rails/app/views/layouts/application.html.erb~
Fixes..