corrected a wild merge conflict
and another missed one
made the gui render on a separate camera and made it dpi dependent
GUI dpi dependent
lobby id typ klar
Merge branch 'master' into sean
strlk knapp
Merge branch 'master' into daniel

Conflicts:
	Assets/Scripts/MovementLogic.cs
	Assets/Scripts/playerCollision.cs