index page completing with css
Merge branch 'master' into alex_css

Conflicts:
	app/assets/stylesheets/application.css
Merge branch 'alex_css'