made some modifications to the layout and index pages
fixed failing parts
Merge branch 'master' of github.com:LaunchAcademy/meta_review into layouts_page

Conflicts:
	app/views/sites/show.html.erb
most recent updates
Merge pull request #40 from LaunchAcademy/layouts_page

made some modifications to the layout and index pages
fixed merge conflict