This is a message
new files
Source Tree trying
Source Tree don’t mess things up please.
Merge commit '363d5b46d249bb0bcc0256f4d3d7a1f74cbfcd28' into V-0.2-Alpha

Conflicts:
	bin/.gitignore
	bin/lifeForms/animals/Lion.class
	bin/types/LifeForm.class
	bin/types/World.class
	bin/worldPanel.class
	src/WorldPanel.java
	src/biomes/Ocean.java
	src/lifeForms/animals/Lion.java
	src/types/World.java
and it’s all together I think. I think everything has been successfully merged, alert me if not.
Reset World.java. Nothing Actually changed
Merge branch 'V-0.2-Alpha'