New map "Castlemap" Start
Merge branch 'master' of https://github.com/Skeeve2/Learning-Repository

Conflicts:
	Intermediate/CachedAssetRegistry.bin
	Saved/Config/Windows/EditorUserSettings.ini
	Saved/Logs/Sample_Project.log
Fixed - Added new map castlemap.umap