fighter model added
Merge branch 'origin/develop'

Conflicts:
	tojam/Assembly-CSharp-Editor-vs.csproj
	tojam/Assembly-CSharp-Editor.csproj
	tojam/Assembly-CSharp-Editor.pidb
	tojam/Assembly-CSharp-firstpass-vs.csproj
	tojam/Assembly-CSharp-firstpass.csproj
	tojam/Assembly-CSharp-firstpass.pidb
	tojam/Assembly-CSharp.pidb
	tojam/Assembly-UnityScript-vs.unityproj
	tojam/Assembly-UnityScript.pidb
	tojam/Assembly-UnityScript.unityproj
	tojam/Assets/Fonts.meta
	tojam/Assets/Fonts/tr2n.meta
	tojam/Assets/Fonts/tr2n/License.txt.meta
	tojam/Assets/Fonts/tr2n/Readme.txt.meta
	tojam/Assets/Fonts/tr2n/TR2N-Sample.png.meta
	tojam/Assets/Fonts/tr2n/Tr2n.ttf.meta
	tojam/Assets/Scenes/FlightTestScene.unity
	tojam/Assets/Textures/drone_texture_v1o.png.meta
	tojam/tojam.userprefs
codes.
Ingoring annoying files.
asdasdsad
Merge branch 'develop' of https://github.com/Seurath/TOJam-8 into develop

Conflicts:
	.gitignore
	tojam/Assembly-CSharp-Editor-vs.csproj
	tojam/Assembly-CSharp-Editor.csproj
	tojam/Assembly-CSharp-firstpass-vs.csproj
	tojam/Assembly-CSharp-firstpass.csproj
	tojam/Assembly-UnityScript-vs.unityproj
	tojam/Assembly-UnityScript.unityproj
Added new light maps/textures for robot arms and spire.
Merge branch 'develop' of https://github.com/Seurath/TOJam-8 into develop
Added orange drone texture.
Added glow beam image.
sooo coool!
Merge branch 'develop' of https://github.com/Seurath/TOJam-8 into develop
* Sweet Graphiques.
* additional grafiques.
Added crosshairs.
Merge branches 'develop' and 'develop' of https://github.com/Seurath/TOJam-8 into develop
Added white and orange brick textures.
* addidional excellence.
Merge branch 'develop' of https://github.com/Seurath/TOJam-8 into develop
* Crosshair Graphiques.