Add joining player to printed player list
Merge commit '73e5bc9' into merge3

Conflicts:
	src/server.cpp