Tile borders
Include gson
Merge branch 'develop' of https://github.com/Swadq/Platformer into develop

Conflicts:
	.gitignore
	bin/GameLoop.class
	bin/Map.class
	src/Map.java
Updated map