last change while HD
Merge branch 'master' of github.com:horie1024/hack_36

Conflicts:
	app.js