update_JS
Merge branch 'master' of https://github.com/ttoky/JS_hangshin

Conflicts:
	140404_JS_canvas/index.html
update_home