Lots of stuff.

Can't really remember...
Merge branch 'master' of https://github.com/FCExB/bearded-ninja

Conflicts:
	bin/data/rock.png
	bin/data/shadow.png
	bin/game/Camera.class
	bin/game/Main.class
	bin/game/TheWild.class
	bin/game/entities/Entity.class
	bin/game/entities/MovingEntity.class
	bin/game/entities/moving/Bullet.class
	bin/game/entities/moving/Creature.class
	bin/game/entities/moving/Player.class
	bin/game/entities/stationary/Explosion.class
	bin/game/entities/stationary/Rock.class
	bin/game/entities/stationary/Tree.class
	bin/game/world/Tile.class
	bin/game/world/World.class
	bin/util/Assets.class
	bin/util/Attribute.class
	bin/util/Attributes.class