Bunny Updates
Merge branch 'master' of https://github.com/funonly/AwesomeMod

Conflicts:
	src/minecraft/awesome/EntityBunny.java