タイトル変更。日本語付
Merge branch 'master' of github.com:Git-workshop-GUI/guys-meet-git-F into f/konno

Conflicts:
	public/index.html
Merge pull request #7 from Git-workshop-GUI/f/konno

タイトル変更。日本語付