Iupdated map#
comm
Merge github.com:f-prettyland/JP-ChickenPeople

asdasdConflicts:
	home.php