update
Merge branch 'master' of github.com:sugyo/trema_juku

Conflicts:
	sinatra/test-controller-web.rb