Signed-off-by: Krzysztof Pintscher <krzysztof@pintscher.pl>
Merge branch 'master' of https://github.com/cremmy/spacewar

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Materials.meta
	Assets/test.unity
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/33/33d70c4d9b88bc745b1dca3f078b0c68
	Library/metadata/7f/7ff2a81013fb02845a3546cbd917ada0
	Library/metadata/a4/a417e8116a4add942b64dee0054e181c