Fixed the error!
Merge branch 'master' of https://github.com/BoXHocK/ShopTeleport

Conflicts:
	.DS_Store