ダニエルのための
Fix html. Add main.js
Fix main.js.
Fix conflict.
Merge branch 'master' of github.com:origia/conductor-frontend
ポインタと線
Add functionality to move dialog.
Merge branch 'master' of github.com:origia/conductor-frontend
Update main.js.
Improve overlay move.
Made tight information window
index
draw
Merge branch 'master' of github.com:origia/conductor-frontend

Conflicts:
	js/draw.js
スタイル修正
Bigger list
CSSed img on li
Separated api functions.
Merge branch 'master' into tadayuki