second wave of assets added
all items work
dk
Merge branch 'master' of https://github.com/dyxh/cs220

Conflicts:
	Platformer/Binaries/Mac/UE4Editor-Platformer-Mac-DebugGame.dylib