Merge branch 'master' of https://github.com/PurdueSIGGD/KillerPlatform

Conflicts:
	Content/Maps/Example_Map.umap