fixing some fucked up git shit

Signed-off-by: Matt Radford <matthewpierreradford@gmail.com>
Squashed commit of the following:

commit 8781f4f9eeffc3832aa7c9a3ed21267eb6ab9d2c
Merge: c46ab3f 8b3f8a7
Author: Matt Radford <matthewpierreradford@gmail.com>
Date:   Tue Sep 9 22:27:16 2014 -0700

    Merge remote-tracking branch 'origin/Development'

    Signed-off-by: Matt Radford <matthewpierreradford@gmail.com>

    Conflicts:
    	Assets/Animation/Characters/character_viper.prefab
    	Assets/Animation/Characters/worldToScreen.js.meta
    	Assets/Design/Scripts/UI/ui_enableIfEnemy.js.meta
    	Assets/Editor/SetPivot.cs.meta
    	Assets/teamMovement.unity
    	Library/CurrentMaximizeLayout.dwlt
    	Library/InspectorExpandedItems.asset
    	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
    	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
    	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
    	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
    	Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
    	Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
    	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
    	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
    	Library/ScriptAssemblies/Assembly-UnityScript.dll
    	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
    	Library/assetDatabase3
    	Library/guidmapper
    	Library/metadata/0b/0bfb7dca7a50743c4b3fdb437a7e23ff
    	Library/metadata/18/189d243889d1e443096fe130eb12ab3d
    	Library/metadata/19/1959a1be31d9d47b8a2426acbdc8bb15
    	Library/metadata/1a/1a79a95b2f703407286c32b0de1a34d7
    	Library/metadata/36/36b182bac2cf54e73b01c882c2e90d4c
    	Library/metadata/60/6010e4fa86d0c45cf8e3b5be9dd5ecbe
    	Library/metadata/73/73b89a87a833a4a45b218127f7ee1165
    	Library/metadata/82/8275258a87e344234a7e20eb736212ff
    	Library/metadata/90/900a934a4274e4b6ca01f774a25fa433
    	Library/metadata/9a/9a0ba78ac1d69443da1fb187e55edbfe
    	Library/metadata/9b/9b768985c071040188dc5805cdd3ff10
    	Rainbow-csharp.sln
    	Rainbow.sln
    	Temp/UnityTempFile-01ffab6aaf6494d738807ff13845dce5
    	Temp/UnityTempFile-03cd5e74178d04670981a5c7572f7da2
    	Temp/UnityTempFile-05349f58f0fb74d16832f37c0ab9c4f1
    	Temp/UnityTempFile-06adce33b4c7b42c28cea3bdbca58bea
    	Temp/UnityTempFile-080905f6223f04a2aa08bfe64d8a8aa5
    	Temp/UnityTempFile-08f4f98543275455fb3f546b9bd4ddf3
    	Temp/UnityTempFile-0a2e62fe190a14eb8919a2350071f35c
    	Temp/UnityTempFile-0c74d0666cd62458c96fe064dea85966
    	Temp/UnityTempFile-10230fd064e01420ab68ffe74946742a
    	Temp/UnityTempFile-105e1d6746824435fa32f579dcdb61dc
    	Temp/UnityTempFile-143c0653a292440dbaf1395ef8c4e31c
    	Temp/UnityTempFile-1605d94ec037b4bcf8a0db6d434a638d
    	Temp/UnityTempFile-19354692f1f8d48a2bb572d8189b4c59
    	Temp/UnityTempFile-1abc5187928e34703978ae610ed29285
    	Temp/UnityTempFile-2702ad17509364324b07730a722a258e
    	Temp/UnityTempFile-2838b757491284ba48259ddd6faeb646
    	Temp/UnityTempFile-3a03e1c45cad542c39b241a89203ef1d
    	Temp/UnityTempFile-41f8298f262ed4d938c748c4f3133e01
    	Temp/UnityTempFile-685e760baa8ca42c896d4786921a85c0
    	Temp/UnityTempFile-7c080aedf72d64f5d81757129573555b
    	Temp/UnityTempFile-927fc351f56e2418ebbc52f8de8d8ff5
    	Temp/UnityTempFile-a2702d6673a834d3197b605a7b1ffcd0
    	Temp/UnityTempFile-a5ee0e3647d874fbc9b68a020da52cd1
    	Temp/UnityTempFile-a6df88d785d5442a1b1eee800b25375b
    	Temp/UnityTempFile-b2c0e21dd38cb44239c5a4c554d1f6dc
    	Temp/UnityTempFile-b30aafe8ea72f4fcaaaffe8a80292a8b
    	Temp/UnityTempFile-bb003c01196c64b9b978776d6b0e4764
    	Temp/UnityTempFile-bf4ee296a30064d70834a3f3839d797c
    	Temp/UnityTempFile-c57e3fd053cf94b6f8e05b26d9286943
    	Temp/UnityTempFile-f2f5d10fa84be4f259499b4096d46ccf
    	Temp/UnityTempFile-f333853fc4731431a92c71e477002707
    	Temp/UnityTempFile-fa0aade67afda47b6b675d25a24de380
    	Temp/__EditModeScene

commit 8b3f8a794aa7c8ca074b5473225f940c168f0e34
Author: Matt Radford <matthewpierreradford@gmail.com>
Date:   Mon Sep 8 22:58:28 2014 -0700

    UI ELEMENTS

    added UI elements in 3d space! you now see targeting icons over enemies

    Signed-off-by: Matt Radford <matthewpierreradford@gmail.com>

Signed-off-by: Matt Radford <matthewpierreradford@gmail.com>
Merge branch 'Development' of https://github.com/mradfo21/Rainbow

Signed-off-by: Matt Radford <matthewpierreradford@gmail.com>

Conflicts:
	Assets/Design/Scripts/UI/icons.meta
	Assets/Design/Scripts/UI/icons/target_1.psd.meta
	Assets/Design/Scripts/UI/icons/target_2.psd.meta
	Assets/Design/Scripts/UI/icons/target_3.psd.meta
	Assets/Design/Scripts/UI/icons/target_4.psd.meta
	Assets/Design/Scripts/UI/icons/target_5.psd.meta
	Assets/Design/Scripts/UI/icons/target_6.psd.meta
	Assets/Design/Scripts/UI/icons/target_7.psd.meta
	Rainbow-csharp.sln
	Rainbow.sln
	Temp/UnityTempFile-05e29d143ff654873ab9e8781b83737a
	Temp/UnityTempFile-0b8f285465a174538ac7a1dc3528e54d
	Temp/UnityTempFile-2702ad17509364324b07730a722a258e
	Temp/UnityTempFile-2702ad17509364324b07730a722a258e~HEAD
	Temp/UnityTempFile-2afd388d55846400484bdd99e41fa698
	Temp/UnityTempFile-34b12edeaa4e8455b998bce6bf360fbd
	Temp/UnityTempFile-35ff7d212481b4757872ed92db2f61e1
	Temp/UnityTempFile-3a03e1c45cad542c39b241a89203ef1d
	Temp/UnityTempFile-41f8298f262ed4d938c748c4f3133e01
	Temp/UnityTempFile-41f8298f262ed4d938c748c4f3133e01~HEAD
	Temp/UnityTempFile-41f8298f262ed4d938c748c4f3133e01~origin_Development
	Temp/UnityTempFile-7c080aedf72d64f5d81757129573555b
	Temp/UnityTempFile-7c080aedf72d64f5d81757129573555b~HEAD
	Temp/UnityTempFile-7c080aedf72d64f5d81757129573555b~origin_Development
	Temp/UnityTempFile-a6df88d785d5442a1b1eee800b25375b
	Temp/UnityTempFile-a6df88d785d5442a1b1eee800b25375b~HEAD_0
	Temp/UnityTempFile-bf4ee296a30064d70834a3f3839d797c
	Temp/UnityTempFile-bf4ee296a30064d70834a3f3839d797c~origin_Development
	Temp/UnityTempFile-c57e3fd053cf94b6f8e05b26d9286943
	Temp/UnityTempFile-c57e3fd053cf94b6f8e05b26d9286943~origin_Development
	Temp/UnityTempFile-f2f5d10fa84be4f259499b4096d46ccf~origin_Development
	Temp/UnityTempFile-f333853fc4731431a92c71e477002707~HEAD