update
Merge branch 'master' of https://github.com/seok0721/clo

Conflicts:
	Viewer/simple.html