level design for city, story framework
merging assets
Merge branch 'master' of https://github.com/Brolita/HashtagGame

Conflicts:
	Content/Maps/Example_Map.umap
	Content/Player/TeddyBunny.uasset