Add .nojekyll file
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/kotaroshima/playlist into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of github.com:kotaroshima/playlist into gh-pages

Conflicts:
	.gitmodules
Merge branch 'gh-pages'