HEY this is the build with all the assets it! Check it out
Daniel_H updates to Scene

I've made some changes to the scene, fixed a few things, and began work
on a new feature which is not currently being used by the scene.
Here is the level being built in more detail
in class build
tower new mesh
added a new scene 1.2 which has a updated camera view + target system that makes the player shoot directly at the crosshair
kats updates 8/20
Merge branch 'kat' into Dani_T
merged dani_h stuff with danikat
Merge branch 'Daniel_h' into danikat
my update for 8-22-14
08/26/14
changed the camera raycast script a bit. Raycast works like a charm on scenes 1.2 and rootlevel, but has bufs on scenes 1.0 and 1.1, trying to trouble shoot the issue
Here is teh level that was built by will
just another push
Merge remote-tracking branch 'origin/omar' Merging omar branch into master

Conflicts:
	.DS_Store
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	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/expandedItems
	Library/guidmapper
	Library/metadata/01/0160245192a6e4a478498286cf87b870
	Library/metadata/03/03eca3c8fafc0435eb4ebeff8e916892
	Library/metadata/05/05dd194cbad804fa4974da24bbcdc31a
	Library/metadata/06/069468fd92f5a4378a6079b80ece798d
	Library/metadata/09/09c40cb46f4b9496bbf21599974fef41
	Library/metadata/0a/0ae283222a43840bb94732054a12793a
	Library/metadata/0e/0eb586a8f9cc04af4bcd76b86504098c
	Library/metadata/0f/0f41180c4445548b89d299a5d7ec4ade
	Library/metadata/0f/0f92dd769ca8b41449490f0770558371
	Library/metadata/12/124a92670a0114bc99ce03f71e224198
	Library/metadata/15/15b446ec385794b34b541322fd7950c4
	Library/metadata/16/1652502075b784d6a8657f7171355871
	Library/metadata/16/16e87bef095b346cfaaf7dd8738bdd5a
	Library/metadata/17/1758dc1ba6e56474a80cf8ceaff26d6a
	Library/metadata/18/18a1daf3326e0429ba6dac273f7f6f76
	Library/metadata/18/18ae0c7a548a54067a2904f343819f95
	Library/metadata/18/18c8caa9b595b4f74a9d8dc45133e208
	Library/metadata/24/242d9303836de45dc909d0996de9aa07
	Library/metadata/27/2711433e14b4e41918567a6d633c7ffb
	Library/metadata/27/2756941f0f1c9439a93f24a076659100
	Library/metadata/2c/2c47aeec1bd4341db944fa23413b5c28
	Library/metadata/2c/2cb09cebfe1684860b9e03fa5fdce2e7
	Library/metadata/30/301a967befca247558f625f385d71c1b
	Library/metadata/30/3035881cbada645768568d687f980580
	Library/metadata/37/3728ef2142a664950a3480f0664c0438
	Library/metadata/38/38cebb92845dd45f28e368ef130257af
	Library/metadata/38/38f4c5b84f75f444cb083c7f05ece3ac
	Library/metadata/3d/3d6f8003ffc234593a3c64f252567819
	Library/metadata/3e/3ea2652c6e29f48fe9255681e9a607bf
	Library/metadata/41/41755edfcc31d47f09c721f235501291
	Library/metadata/45/45454b35e6f9e4a27ab323629490328c
	Library/metadata/46/465f05f7873964eb58ce8513a9301404
	Library/metadata/47/471729da3e440461889dc543ed3b4b8a
	Library/metadata/49/49dfa6661d0db4615ba7e75397800d84
	Library/metadata/4e/4e4f7e665ee434e1ab8a39813ff9d31e
	Library/metadata/4e/4e97e91ca02804dd0a893b7601db2ec9
	Library/metadata/4e/4ece215cca0f34efd8162cb780672973
	Library/metadata/50/505db131d1b684fe2b6a8e3add2a3060
	Library/metadata/53/534dad577ad334041868a5e194832d4a
	Library/metadata/58/58389ccd9bb044ed8ab75bea744e816a
	Library/metadata/58/58a526de8fb544c8bae258abf258fc28
	Library/metadata/59/59a97b76cdc9e43ca86db5bc3e7e5932
	Library/metadata/5e/5ee1ae651661644df891ff4567a19a4b
	Library/metadata/60/6067a5df126964d78bc77110b357409c
	Library/metadata/66/66c2eacbf46c142a9b69ea6a6a9ab67e
	Library/metadata/68/68015ac4f20bf408e84f8221136a6e9e
	Library/metadata/69/69292092d3a38453d9dcf9e02e48eb12
	Library/metadata/69/69f354384846f4321aeeb3993921c0b6
	Library/metadata/6a/6a6eea5c0254b4a36b316fba28c62a99
	Library/metadata/6b/6bfd677ac79ce4a5e9161adbf15acc7d
	Library/metadata/6d/6decdbbed80a7411bb55a711e7a24f3e
	Library/metadata/73/73cc940521f3a4c938e7f3d22c0de125
	Library/metadata/73/73d2b0f1a9fe540aaa41c8df257e7a0e
	Library/metadata/75/75e3499e47ba24e5ea6f8aaef4bcca64
	Library/metadata/77/77dec9ab600764f108b97303e7ef5c23
	Library/metadata/78/78769b28abe8240c7aa607e808ab7e89
	Library/metadata/78/78ae1dc9e26a946f49be4823b67d887d
	Library/metadata/79/7926fef7a013c499896d3761107210b5
	Library/metadata/79/7959114fcb8224d7dba26d329470d5ea
	Library/metadata/7a/7ad4e93035dfd459495ffa77704620c4
	Library/metadata/7c/7cdeda6bc6217499ca8772bebfb1ad48
	Library/metadata/7e/7e31945a7c18242f9862e09caf0d8ad8
	Library/metadata/83/83c89fee2137a4b8c8cc6ec1c4e10aa5
	Library/metadata/85/857907b1de37b4aef94c67c0f2021cc4
	Library/metadata/87/87314a2ddd7e4498ba9023e23e8fdaed
	Library/metadata/89/89553fe9d8e6b47a3a43383bc605b724
	Library/metadata/90/905f699a86031485f8d1a997c16f1903
	Library/metadata/92/92daef2b096064c2490cea1a01490f88
	Library/metadata/95/95906ee593f164c73b8c40a12c0ae5bc
	Library/metadata/96/969f1421c77074b9babc1cac6b6bd7de
	Library/metadata/9c/9c4566626b8f34afebb8f373098258ba
	Library/metadata/9d/9d694ccea2d8146d2b10f7bfee4ca93e
	Library/metadata/9f/9f8da6c4c7fa24c7ab3fd22d40af4994
	Library/metadata/a6/a670ff005930e49ca9151e4e1b03e62f
	Library/metadata/a6/a6a136ce9b9224143ac5397c65e3df5e
	Library/metadata/a9/a9750998e06f04d4b8d96809787e732c
	Library/metadata/a9/a9edfb338289b4fd2a71d2d3abe930d8
	Library/metadata/aa/aaf176898134b4087ae4c822a1832e85
	Library/metadata/ac/ac07dc9dfa1c84a71a9cfe29fa919673
	Library/metadata/ad/adb9c6e64ebd44ead8c184d437bd8e95
	Library/metadata/b1/b1547543614fa489eb9d6a2cdecaf21f
	Library/metadata/b1/b1c4758a1e8f04370b1f81fddec0857d
	Library/metadata/b3/b3c6f7aa60a1e41dc8706e3902d3020a
	Library/metadata/b5/b5afe608f06dc400e945d22f2a6f02a0
	Library/metadata/b9/b97681b38342e4ac697222a184b1072b
	Library/metadata/ba/ba164eb3c3c3040c090295121b5295b2
	Library/metadata/bf/bf67846d0fb9045f9817fa5a83bf7ffd
	Library/metadata/c1/c116c103757064c3da755825b1fcbbd3
	Library/metadata/c3/c37f5f337abcd4da99ec0253ff240af2
	Library/metadata/c4/c4fdcbdae18e04cb09ce2bf5fa599f98
	Library/metadata/c5/c5866bb8055a643bb83125cf87822d14
	Library/metadata/c5/c59ee69550dcf4415944d69efe0c4081
	Library/metadata/c6/c677d8760f49c41efa73d97bf44bc222
	Library/metadata/c6/c68ca0c8966434b49a915a798325426b
	Library/metadata/c8/c88e558f790364e648dd7548746332d6
	Library/metadata/c8/c8eb73bb087994e139ae0521b87abeb7
	Library/metadata/c9/c9717a3a19b7b412e86c53dec283b29b
	Library/metadata/ca/ca5d65c4ec0eb48debf6844cbad3cf31
	Library/metadata/d5/d51a8bc019fdc4ce58110e463628505f
	Library/metadata/d6/d641fe3e1ac1c4602aacfcda783f7636
	Library/metadata/db/db69fc4d3c85f428c9b814b110ab5331
	Library/metadata/db/db8ff092e072d41e2b39191e5fb0391d
	Library/metadata/dd/ddf45f3d5da214e21b989d8ba842e497
	Library/metadata/e4/e478ae783e365453bbb57de4e0395a2d
	Library/metadata/e7/e7113597ab0b24b8595372583ec287a1
	Library/metadata/e7/e744b3c8bd9d74ed3bd7c1ea65e86ab3
	Library/metadata/e8/e8ecdd082dc2649a5a8496bd18ec17e3
	Library/metadata/ed/ed89bbfa5afdd47ccb04cfa2911317b4
	Library/metadata/ee/ee5b7b41c1b1e4aefbd6b71d04483d41
	Library/metadata/f5/f56fa80c3ca6a4e23bf75ac4c0c30f2a
	Library/metadata/f6/f6b958fb1f40346a4b921b4d5fde7871
	Library/metadata/f8/f87cedb083262499f812dbbac7992e2e
	Library/metadata/fa/fa5e56082b5ea4aebb326d28a9d36629
	Library/metadata/fe/fe1bb9c7602c541a89b9fece8c002ba3
	ProjectSettings/EditorBuildSettings.asset
	Temp/__EditModeScene
	towerdefence2-csharp.sln
	towerdefence2.sln
changes on camera script

camera has a ray cast script for targeting
Merge branch 'master' into dani_T

Conflicts:
	.DS_Store
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	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/expandedItems
	Library/guidmapper
	Library/metadata/01/0160245192a6e4a478498286cf87b870
	Library/metadata/03/03eca3c8fafc0435eb4ebeff8e916892
	Library/metadata/05/05dd194cbad804fa4974da24bbcdc31a
	Library/metadata/06/069468fd92f5a4378a6079b80ece798d
	Library/metadata/09/09c40cb46f4b9496bbf21599974fef41
	Library/metadata/0a/0ae283222a43840bb94732054a12793a
	Library/metadata/0e/0eb586a8f9cc04af4bcd76b86504098c
	Library/metadata/0f/0f41180c4445548b89d299a5d7ec4ade
	Library/metadata/0f/0f92dd769ca8b41449490f0770558371
	Library/metadata/12/124a92670a0114bc99ce03f71e224198
	Library/metadata/15/15b446ec385794b34b541322fd7950c4
	Library/metadata/16/1652502075b784d6a8657f7171355871
	Library/metadata/16/16e87bef095b346cfaaf7dd8738bdd5a
	Library/metadata/17/1758dc1ba6e56474a80cf8ceaff26d6a
	Library/metadata/18/18a1daf3326e0429ba6dac273f7f6f76
	Library/metadata/18/18ae0c7a548a54067a2904f343819f95
	Library/metadata/18/18c8caa9b595b4f74a9d8dc45133e208
	Library/metadata/24/242d9303836de45dc909d0996de9aa07
	Library/metadata/27/2711433e14b4e41918567a6d633c7ffb
	Library/metadata/27/2756941f0f1c9439a93f24a076659100
	Library/metadata/2c/2c47aeec1bd4341db944fa23413b5c28
	Library/metadata/2c/2cb09cebfe1684860b9e03fa5fdce2e7
	Library/metadata/30/301a967befca247558f625f385d71c1b
	Library/metadata/30/3035881cbada645768568d687f980580
	Library/metadata/37/3728ef2142a664950a3480f0664c0438
	Library/metadata/38/38cebb92845dd45f28e368ef130257af
	Library/metadata/38/38f4c5b84f75f444cb083c7f05ece3ac
	Library/metadata/3d/3d6f8003ffc234593a3c64f252567819
	Library/metadata/3e/3ea2652c6e29f48fe9255681e9a607bf
	Library/metadata/41/41755edfcc31d47f09c721f235501291
	Library/metadata/45/45454b35e6f9e4a27ab323629490328c
	Library/metadata/46/465f05f7873964eb58ce8513a9301404
	Library/metadata/47/471729da3e440461889dc543ed3b4b8a
	Library/metadata/49/49dfa6661d0db4615ba7e75397800d84
	Library/metadata/4e/4e4f7e665ee434e1ab8a39813ff9d31e
	Library/metadata/4e/4e97e91ca02804dd0a893b7601db2ec9
	Library/metadata/4e/4ece215cca0f34efd8162cb780672973
	Library/metadata/50/505db131d1b684fe2b6a8e3add2a3060
	Library/metadata/53/534dad577ad334041868a5e194832d4a
	Library/metadata/58/58389ccd9bb044ed8ab75bea744e816a
	Library/metadata/58/58a526de8fb544c8bae258abf258fc28
	Library/metadata/59/59a97b76cdc9e43ca86db5bc3e7e5932
	Library/metadata/5e/5ee1ae651661644df891ff4567a19a4b
	Library/metadata/60/6067a5df126964d78bc77110b357409c
	Library/metadata/66/66c2eacbf46c142a9b69ea6a6a9ab67e
	Library/metadata/68/68015ac4f20bf408e84f8221136a6e9e
	Library/metadata/69/69292092d3a38453d9dcf9e02e48eb12
	Library/metadata/69/69f354384846f4321aeeb3993921c0b6
	Library/metadata/6a/6a6eea5c0254b4a36b316fba28c62a99
	Library/metadata/6b/6bfd677ac79ce4a5e9161adbf15acc7d
	Library/metadata/6d/6decdbbed80a7411bb55a711e7a24f3e
	Library/metadata/73/73cc940521f3a4c938e7f3d22c0de125
	Library/metadata/73/73d2b0f1a9fe540aaa41c8df257e7a0e
	Library/metadata/75/75e3499e47ba24e5ea6f8aaef4bcca64
	Library/metadata/77/77dec9ab600764f108b97303e7ef5c23
	Library/metadata/78/78769b28abe8240c7aa607e808ab7e89
	Library/metadata/78/78ae1dc9e26a946f49be4823b67d887d
	Library/metadata/79/7926fef7a013c499896d3761107210b5
	Library/metadata/79/7959114fcb8224d7dba26d329470d5ea
	Library/metadata/7a/7ad4e93035dfd459495ffa77704620c4
	Library/metadata/7c/7cdeda6bc6217499ca8772bebfb1ad48
	Library/metadata/7e/7e31945a7c18242f9862e09caf0d8ad8
	Library/metadata/83/83c89fee2137a4b8c8cc6ec1c4e10aa5
	Library/metadata/85/857907b1de37b4aef94c67c0f2021cc4
	Library/metadata/87/87314a2ddd7e4498ba9023e23e8fdaed
	Library/metadata/89/89553fe9d8e6b47a3a43383bc605b724
	Library/metadata/90/905f699a86031485f8d1a997c16f1903
	Library/metadata/92/92daef2b096064c2490cea1a01490f88
	Library/metadata/95/95906ee593f164c73b8c40a12c0ae5bc
	Library/metadata/96/969f1421c77074b9babc1cac6b6bd7de
	Library/metadata/9c/9c4566626b8f34afebb8f373098258ba
	Library/metadata/9d/9d694ccea2d8146d2b10f7bfee4ca93e
	Library/metadata/9f/9f8da6c4c7fa24c7ab3fd22d40af4994
	Library/metadata/a6/a670ff005930e49ca9151e4e1b03e62f
	Library/metadata/a6/a6a136ce9b9224143ac5397c65e3df5e
	Library/metadata/a9/a9750998e06f04d4b8d96809787e732c
	Library/metadata/a9/a9edfb338289b4fd2a71d2d3abe930d8
	Library/metadata/aa/aaf176898134b4087ae4c822a1832e85
	Library/metadata/ac/ac07dc9dfa1c84a71a9cfe29fa919673
	Library/metadata/ad/adb9c6e64ebd44ead8c184d437bd8e95
	Library/metadata/b1/b1547543614fa489eb9d6a2cdecaf21f
	Library/metadata/b1/b1c4758a1e8f04370b1f81fddec0857d
	Library/metadata/b3/b3c6f7aa60a1e41dc8706e3902d3020a
	Library/metadata/b5/b5afe608f06dc400e945d22f2a6f02a0
	Library/metadata/b9/b97681b38342e4ac697222a184b1072b
	Library/metadata/ba/ba164eb3c3c3040c090295121b5295b2
	Library/metadata/bf/bf67846d0fb9045f9817fa5a83bf7ffd
	Library/metadata/c1/c116c103757064c3da755825b1fcbbd3
	Library/metadata/c3/c37f5f337abcd4da99ec0253ff240af2
	Library/metadata/c4/c4fdcbdae18e04cb09ce2bf5fa599f98
	Library/metadata/c5/c5866bb8055a643bb83125cf87822d14
	Library/metadata/c5/c59ee69550dcf4415944d69efe0c4081
	Library/metadata/c6/c677d8760f49c41efa73d97bf44bc222
	Library/metadata/c6/c68ca0c8966434b49a915a798325426b
	Library/metadata/c8/c88e558f790364e648dd7548746332d6
	Library/metadata/c8/c8eb73bb087994e139ae0521b87abeb7
	Library/metadata/c9/c9717a3a19b7b412e86c53dec283b29b
	Library/metadata/ca/ca5d65c4ec0eb48debf6844cbad3cf31
	Library/metadata/d5/d51a8bc019fdc4ce58110e463628505f
	Library/metadata/d6/d641fe3e1ac1c4602aacfcda783f7636
	Library/metadata/db/db69fc4d3c85f428c9b814b110ab5331
	Library/metadata/db/db8ff092e072d41e2b39191e5fb0391d
	Library/metadata/dd/ddf45f3d5da214e21b989d8ba842e497
	Library/metadata/e4/e478ae783e365453bbb57de4e0395a2d
	Library/metadata/e7/e7113597ab0b24b8595372583ec287a1
	Library/metadata/e7/e744b3c8bd9d74ed3bd7c1ea65e86ab3
	Library/metadata/e8/e8ecdd082dc2649a5a8496bd18ec17e3
	Library/metadata/ed/ed89bbfa5afdd47ccb04cfa2911317b4
	Library/metadata/ee/ee5b7b41c1b1e4aefbd6b71d04483d41
	Library/metadata/f5/f56fa80c3ca6a4e23bf75ac4c0c30f2a
	Library/metadata/f6/f6b958fb1f40346a4b921b4d5fde7871
	Library/metadata/f8/f87cedb083262499f812dbbac7992e2e
	Library/metadata/fa/fa5e56082b5ea4aebb326d28a9d36629
	Library/metadata/fe/fe1bb9c7602c541a89b9fece8c002ba3
	ProjectSettings/EditorBuildSettings.asset
	Temp/__EditModeScene
	towerdefence2-csharp.sln
	towerdefence2.sln
here are some of the sounds inside of the game
OMAR - new scene stuff