working on homepage
merrged
htmlhtmlcss
merged
CUTS not TOPICS
adding show view
Merge pull request #5 from gopher-snakes-2013/routes-views

homepage view
Merge branch 'master' into show-view

Conflicts:
	app/assets/stylesheets/style.css
	app/views/layouts/application.html.erb