Finish static pages
Merge remote branch 'origin/master'

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	config/initializers/secret_token.rb
	config/routes.rb
	spec/spec_helper.rb