Merge remote-tracking branch 'origin/master'

Conflicts:
	SpaceCOG Client/Assets/Sprites/Thumbs.db.meta
	SpaceCOG Client/Library/CurrentLayout.dwlt
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SpaceCOG Client/Library/assetDatabase3
	SpaceCOG Client/Library/expandedItems
	SpaceCOG Client/Library/guidmapper
	SpaceCOG Client/Library/metadata/5d/5dc9f3bdf075f4e40924936435e96ef5
	SpaceCOG Client/SpaceCOG Client-csharp.sln
	SpaceCOG Client/SpaceCOG Client.sln
Added asteroid

No ship yet...
It's a real game! Sort of...

Asteroids spawn near player.  Player scores points for shooting
asteroids and dies if he is hit.
Added a player ship
Random commit because I need to sync my remote master to merge
Merge branch 'Ui-and-Sprites'

Conflicts:
	SpaceCOG Client/Library/CurrentLayout.dwlt
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-UnityScript.dll
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	SpaceCOG Client/Library/assetDatabase3
	SpaceCOG Client/Library/expandedItems
	SpaceCOG Client/Library/metadata/b4/b46b765437631c343a7cc1c67d69cd48
	SpaceCOG Client/SpaceCOG Client-csharp.sln
	SpaceCOG Client/SpaceCOG Client.sln
Revert "Merge branch 'Ui-and-Sprites'"

This reverts commit b0146b839a9fff0615b37cc8be8e92e795691237, reversing
changes made to 02525bf5bc3e2e0535b14780cb8355293f4f9ff4.
Committing networking branch before the merge.
Merge branch 'networking'

Conflicts:
SpaceCOG Client/Library/CurrentLayout.dwlt
SpaceCOG Client/Library/InspectorExpandedItems.asset
SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll
SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
SpaceCOG Client/Library/assetDatabase3
SpaceCOG Client/Library/expandedItems
SpaceCOG Client/Library/guidmapper
SpaceCOG Client/Library/metadata/03/0322d5b52c100c844be4713c8d79720b
SpaceCOG Client/SpaceCOG Client-csharp.sln
SpaceCOG Client/SpaceCOG Client.sln
SpaceCOG Client/SpaceCOG Client.userprefs
Added gitignore
Made the game scene more single player friendly
Asteroids spawn and kill players

Players can shoot down the asteroids
No gameover yet
Collision detection & gameover

Turning temporarily disabled because it made me unhappy.
merged master
changed hazards a bit

ready to push to master
Major Cleanup

Lots of old scenes, scripts, textures, and more were deleted since they
were no longer needed. Some bugs were fixed too.
Normal Unity Forced Commit
Normal Unity Forced Commit
Cleaned code, fixed game not restarting bug
Ship Rotation Reimplemented

The ship now rotates about its z-axis to look at the cursor.