home button
css files merged

Merge branch 'master' into css

Conflicts:
	app/assets/stylesheets/application.css.erb
Merge pull request #30 from RossWittenberg/css

home button
modified bars controller