Player and host names now appear in host multiplayer lobby
 fix conflictsMerge branch 'master' of https://github.com/LiamDeGrey/Mansion-Bandit