animation kinda complete
Merge branch 'master' of https://github.com/Noeyfan/Working

Conflicts:
	PsychoKiller/Assets/Models/House/FirstFloor/rug/rug.mb.meta