0202
Merge branch 'master' of github.com:YukioMakuta/MakutaSystem

Conflicts:
	app/views/welcome/index.html.erb