?

?
Merge branch 'master' of https://github.com/tendousouji/Assignment

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
	script/rails