Merge master into server
dummy work
first attempt at server
fixed gamestarter to keep running
bugfix
client created
client created