testを修正？
commit 失敗
HelloJavascriptの変更を修正
Merge https://github.com/motoroku/Javascript

Conflicts:
	training/.idea/workspace.xml
	training/src/model.js