Did some major tweaking
Finish layout and routes
Merge branch 'filling-in-layout'

Conflicts:
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/misc.xml
	.idea/railways.cache
	.idea/sample_app.iml
	.idea/workspace.xml
	Gemfile.lock
	Guardfile
	app/views/layouts/application.html.erb
	app/views/static_pages/contact.html.erb
	app/views/static_pages/home.html.erb
	config/routes.rb
	spec/requests/static_pages_spec.rb
	spec/spec_helper.rb