Index view added
Merge branch 'master' into index_routing

Conflicts:
	app/assets/stylesheets/hosts.css.scss
	app/views/layouts/application.html.erb
Fixes things after merge