modify-c
Merge branch 'develop' of github.com:tsubonet/FadeViewer

Conflicts:
	index.html
Merge pull request #1 from tsubonet/develop

Develop
add3
Merge branch 'master' into develop