Items, Bullets, Players
Merge branch 'develop' of https://github.com/Swadq/Platformer into develop

Conflicts:
	src/com/yrs/game/world/Map.java