色々消した
Merge branch 'master' of https://github.com/massirohuyu/SharedTasks

Conflicts:
	index.php