changed .gitignore
Merge branch 'master' of https://github.com/MattTron2000/RocketJump

Conflicts:
	Intermediate/CachedAssetRegistry.bin