Quick update
fixed
Merge branch 'master' of https://github.com/Novynn/Relentless.git

Conflicts:
	core/game/lobby.cpp