who
work
Merge branch 'master' of https://github.com/joePasz/bar-website

Conflicts:
	bar-website-rails/app/assets/stylesheets/main_style_sheet.css
	bar-website-rails/app/assets/stylesheets/main_style_sheet.css~
	bar-website-rails/app/views/layouts/application.html.erb
	bar-website-rails/app/views/layouts/application.html.erb~
Merge pull request #6 from joePasz/master

Server Update