commiting some naturalResources changes
Merge branch 'master' of https://github.com/arstout/GameStuff

Conflicts:
	src/com/filthybanana/world/tile/Tile.java
oh man i hope this doesnt screw anything up