Server fully coded and awaiting final tests of full games.
Merge remote-tracking branch 'origin/master'