Finish static pages
Filling first upload
Merge branch 'master' into filling-in-layout

Conflicts:
	app/helpers/application_helper.rb
	app/views/layouts/application.html.erb
	spec/requests/static_pages_spec.rb
Finish layout and routes