Awesome Ore Generation
Merge branch 'master' of https://github.com/bcwadsworth/Minecraft-2D.git

Conflicts:
	Minecraft 2D/assets/snippets.txt