Added list of currently online players
Fixed merge conflict