network refactor
Merge remote-tracking branch 'origin/master' into net
resolve merge conflicts
network refactor
Adding lives to display
Merge branch 'net' of https://github.com/Stymphalian/DogeFighter into net

Conflicts:
	Assets/SpaceShipControl.cs