Initial work on network
Merge remote-tracking branch 'origin/master'
remove auto generated files
Merge remote-tracking branch 'origin/master'

Conflicts:
	flatmates/Assembly-CSharp-Editor-vs.csproj
	flatmates/Assembly-CSharp-Editor.csproj
	flatmates/Assets/Scripts/GameStateManager.cs
Merge branch 'master' of https://github.com/andreiagaita/PersonalSpaceInvader

Conflicts:
	flatmates/Assets/Resources/Player.prefab
handling merge conflicts
Merge remote-tracking branch 'origin/master'
Networking stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	flatmates/Assets/Resources/Player.prefab
	flatmates/Assets/Scripts/GameStateManager.cs
Merge remote-tracking branch 'origin/master'