Idk what this is
Merge branch 'master' of https://wedmonds:8ebFLEDF!@github.com/Neoky/FPS_Project.git

Conflicts:
	assets/Scripts/Lobby.cs

Signed-off-by: wce0002 <wce0002@uah.edu>