必要ないの消し
Merge branch 'master' of github.com:origia/conductor-frontend

Conflicts:
	index.html
	js/snapshot.js