added heron to hazard generator
Merge branch 'master' of https://github.com/CatsFromMars/RubberDuckAdventure

Conflicts:
	Assets/Scenes/Test.unity
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3