Clean Up? Idk.. Git messed up...

Signed-off-by: jameslfc19 <jameslfc19@gmail.com>
Merge branch 'master' of https://github.com/CodeLiners/JamesForest

Signed-off-by: jameslfc19 <jameslfc19@gmail.com>

Conflicts:
	src/mods/jameslfc19/forest/WorldConfiguration.java
	src/mods/jameslfc19/forest/WorldTab.java
	src/mods/jameslfc19/forest/recipes/JamesRecipes.java
	src/mods/jameslfc19/forest/registry/JamesItem.java
	src/mods/jameslfc19/forest/registry/JamesRegistry.java
Added Savanna

Signed-off-by: jameslfc19 <jameslfc19@gmail.com>