grabbing pulls yo
I hate this
Merge branch 'master' of https://github.com/dimmondslice/SUCCUBE-US

Conflicts:
	SUCCUBEUS/Saved/Logs/SUCCUBEUS.log
enemy spawning mostly done
Fuck git + unreal
gah
any day now
Merge branch 'master' of https://github.com/dimmondslice/SUCCUBE-US

Conflicts:
	SUCCUBEUS/Content/Maps/Example_Map.umap
	SUCCUBEUS/Content/Maps/Level1.umap
	SUCCUBEUS/Intermediate/CachedAssetRegistry.bin
	SUCCUBEUS/Saved/AutoScreenshot.png
	SUCCUBEUS/Saved/Autosaves/Game/Maps/AiSandbox_Auto1.umap
	SUCCUBEUS/Saved/Autosaves/Game/Maps/Level1_Auto3.umap
	SUCCUBEUS/Saved/Config/Windows/Editor.ini
	SUCCUBEUS/Saved/Config/Windows/EditorLayout.ini
	SUCCUBEUS/Saved/Config/Windows/EditorUserSettings.ini
	SUCCUBEUS/Saved/Logs/SUCCUBEUS.log
Merge branch 'master' of https://github.com/dimmondslice/SUCCUBE-US

Conflicts:
	SUCCUBEUS/Content/Blueprints/MyCharacter.uasset