Fixed Ignore
Merge branch 'master' of https://github.com/BoXHocK/ShopTeleport

Conflicts:
	src/.DS_Store
	src/main/.DS_Store
	src/main/java/.DS_Store
	src/main/java/no/.DS_Store