Added comments (actually committed these)
Merge branch 'master' of https://github.com/joePasz/bar-website

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