Added landing page
Merge branch 'index'

Conflicts:
	app/views/index.erb
	app/views/layout.erb
	app/views/users/show.erb
	public/css/application.css