: )
: )
Merge branch 'master' of https://github.com/BanXamer/map into BanXamer-master

Conflicts:
	index.php
Merge branch 'BanXamer-master'