TDD
TDD
static pageの完成
Merge branch 'static-pages'

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
	spec/spec_helper.rb