dd
Merge branch 'master' of https://github.com/kimFrost/Space_katana

Conflicts:
	Intermediate/CachedAssetRegistry.bin
(added) - worked in the tron material. Just for learning. The Lerp gives some weird edges. Will have to work on this.