kait added everything pick ups, even prefabs. fixed up health to finish it up.
Merge remote-tracking branch 'origin/kat' into dani_T

Conflicts:
	Assets/Scenes/LEVEL_2_VER_1.1.unity
	Assets/Scripts/Kaitlin/Player_Health_Bar.cs
	Assets/Scripts/Kaitlin/Prefabs/CurrencyPickUp.prefab
	Assets/Scripts/Kaitlin/Prefabs/HealthPickUp.prefab
	Assets/Scripts/Kaitlin/Prefabs/HealthPickUp.prefab.meta
	Assets/Scripts/Kaitlin/Prefabs/PowerPickUp.prefab.meta
	Assets/Scripts/Kaitlin/Prefabs/TempEnemy.prefab
	Assets/Scripts/Kaitlin/Scripts/PickUp.cs
	Assets/Scripts/Kaitlin/Scripts/RotatingPickUp.cs
	Assets/Scripts/Kaitlin/TreeHouse_Health_Bar.cs
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/05/05ba1e61628486241ae555585c757c6b
	Library/metadata/3c/3c9d644e02406d944ba2a1e80decc055
	Library/metadata/40/407947a9402d34a4c9f902215a7f2bf1
	Library/metadata/6f/6fa94fc72c286fb4aab2842c0b6bb023
	Library/metadata/7a/7adc6e88221e220479e8c7a740918940
	Library/metadata/7c/7cfb900d4034e404083877e6d03a88c4
	Library/metadata/7d/7d09aab7f5e19f74db185c1900f9e581
	Library/metadata/84/84620d1fe4c994310b2988e002405019
	Library/metadata/91/912903a50c1773f4fbb3a0927d47e06b
	Library/metadata/c7/c7cf7f8c508810945a569440e6b4d7ac
	Library/metadata/df/df48ba8d121f5472689b095d45d6237b
	Library/shadercompiler-1.log
	Temp/UnityTempFile-01848f4a2c468c341b5599b105d7f695
	Temp/UnityTempFile-225fc6120f9c4134cb8b1e2650be86bc
	Temp/__EditModeScene
	towerdefence2-csharp.sln
	towerdefence2.sln
	towerdefence2.userprefs
updated version of Daniel H, Daniel T, Kaitlin

Updated version of the game as for last week in class.
Daniel:  kaitlin, please check if your scripts are working fine here.