Released a client
Merge branch 'master' of github.com:shiraihii/shiraihiiMCHP

Conflicts:
	map.php