Create README.md
htmlで表示してね
.txtがwebkitでいるみたい
Add package.json and .gitignore
Fix conflict.
Update test.js.
Merge branch 'master' of github.com:origia/conductor-frontend into ui_js

Conflicts:
	package.json
Merge branch 'master' of github.com:origia/conductor-frontend

Conflicts:
	index.html
	js/operation.js
	test.js