work on css
Merge branch 'cssifying'

Conflicts:
	app/views/layouts/application.html.erb
	app/views/welcome/_nav_selector.html.erb