kat added pickup prefabs and picks up work. just need actual stuff to make sure they do what they are suppose to do
Here is teh level that was built by will
just another push
here are some of the sounds inside of the game
OMAR - new scene stuff
Merge branch 'omar'
KAT - added prefabs and pick ups
Merge branch 'kat'
Merge branch 'master' into dani_T

Conflicts:
	Assets/.DS_Store
	Assets/Scenes/LEVEL_2_VER_1.1.unity
	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/guidmapper
	Library/metadata/01/0160245192a6e4a478498286cf87b870
	Library/metadata/03/03f891edd46a3424ba3fb934d0c82754
	Library/metadata/05/05ba1e61628486241ae555585c757c6b
	Library/metadata/0b/0b33493ec07b448e5b75750aba19ed06
	Library/metadata/0d/0ddbb39efb900734f8ab57e597b63614
	Library/metadata/16/16049808530e1da459b689f2e11187dd
	Library/metadata/16/1652502075b784d6a8657f7171355871
	Library/metadata/18/18c8caa9b595b4f74a9d8dc45133e208
	Library/metadata/21/218f340af52e25a4a83ee9afb98b555b
	Library/metadata/27/2711433e14b4e41918567a6d633c7ffb
	Library/metadata/27/2756941f0f1c9439a93f24a076659100
	Library/metadata/2c/2c93002ec586f48e7a0a107768f3ed4c
	Library/metadata/30/3035881cbada645768568d687f980580
	Library/metadata/31/31ae68fe93260914d847042ac169566e
	Library/metadata/36/36564a9231dd9464582d0fd6024b0af9
	Library/metadata/38/38cebb92845dd45f28e368ef130257af
	Library/metadata/38/38f4c5b84f75f444cb083c7f05ece3ac
	Library/metadata/3d/3d4a3c6fa419c6e48beb3454c56ed4e6
	Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Library/metadata/44/44bface7207b0406c81b07d84425576e
	Library/metadata/45/45454b35e6f9e4a27ab323629490328c
	Library/metadata/46/465f05f7873964eb58ce8513a9301404
	Library/metadata/48/480843759ae5d429485a8535d24a9cbc
	Library/metadata/48/48f80f3541605c84da7f46d948af1d72
	Library/metadata/4e/4e97e91ca02804dd0a893b7601db2ec9
	Library/metadata/50/505db131d1b684fe2b6a8e3add2a3060
	Library/metadata/53/534dad577ad334041868a5e194832d4a
	Library/metadata/54/5465c334ba138407d9903facf7b5c192
	Library/metadata/55/550ae6fc792162543bd0a0156ca9877a
	Library/metadata/5b/5b2cb10f0d39f684588a0ff916658369
	Library/metadata/5c/5cd569201585f514184b0a427128571a
	Library/metadata/5d/5d4d46b4954894d8c9503ef6c44a3a04
	Library/metadata/64/64c92cdc91ce39b4a918cff8e751b920
	Library/metadata/66/66c2eacbf46c142a9b69ea6a6a9ab67e
	Library/metadata/69/69f354384846f4321aeeb3993921c0b6
	Library/metadata/6a/6a6eea5c0254b4a36b316fba28c62a99
	Library/metadata/6b/6bfd677ac79ce4a5e9161adbf15acc7d
	Library/metadata/79/7926fef7a013c499896d3761107210b5
	Library/metadata/7a/7ad4e93035dfd459495ffa77704620c4
	Library/metadata/84/84620d1fe4c994310b2988e002405019
	Library/metadata/85/857907b1de37b4aef94c67c0f2021cc4
	Library/metadata/9c/9cef73549edc33a4aab281efa3f59cf1
	Library/metadata/a5/a5fa40bf575be476aa378d6aa7627eec
	Library/metadata/b1/b1167bc086322c34bac43a7e915c49c6
	Library/metadata/b1/b1547543614fa489eb9d6a2cdecaf21f
	Library/metadata/b1/b1c4758a1e8f04370b1f81fddec0857d
	Library/metadata/b2/b21c09e635102426aa5017046dd05d16
	Library/metadata/b5/b5afe608f06dc400e945d22f2a6f02a0
	Library/metadata/b9/b97681b38342e4ac697222a184b1072b
	Library/metadata/ba/bae09a86470b3964db6e18c8e506bb04
	Library/metadata/d0/d00480b6f627944829bf5a204c045a32
	Library/metadata/d5/d51a8bc019fdc4ce58110e463628505f
	Library/metadata/d6/d641fe3e1ac1c4602aacfcda783f7636
	Library/metadata/e2/e295313ba6a1f184cab3314e903841d9
	Library/metadata/e3/e3de1df1ea362464b85e1826adf8a6f0
	Library/metadata/e7/e7113597ab0b24b8595372583ec287a1
	Library/metadata/e8/e8ecdd082dc2649a5a8496bd18ec17e3
	Library/metadata/f6/f60c3007ebd8e4e169d8cb17fe79884d
	Library/metadata/f8/f87cedb083262499f812dbbac7992e2e
	towerdefence2-csharp.sln
	towerdefence2.sln
	towerdefence2.userprefs