Forced commit
Merge branch 'master' of https://github.com/JPen3/JuneGameJam

Conflicts:
	GameJam/Intermediate/CachedAssetRegistry.bin
	GameJam/Saved/AutoScreenshot.png
	GameJam/Saved/Config/Windows/EditorUserSettings.ini
	GameJam/Saved/Logs/MyProject.log