updating css
Merge branch 'master' into css_first_pass

Conflicts:
	db/seeds.rb
css first pass complete, landing page updated
Merge pull request #4 from andmcgregor/css_first_pass

Css first pass