atmr999

re sync
Merge branch 'master' of https://github.com/atmr999/pmpractice

Conflicts:
	horiuchi-a/logcheck.php