1.0 version
Merge branch 'master' of github.com:koyabr/danmaku-site

Conflicts:
	README.md