Clear engine
Clear engine
!!
Merge branch 'master' of https://github.com/BanXamer/map into BanXamer-master

Conflicts:
	index.php
Merge branch 'BanXamer-master'
Merge pull request #3 from BanXamer/master

test
Merge remote-tracking branch 'remotes/upstream/master'