resolve asset merge conflict
code cleanup pt1
fix renderers
haha am idiot, needed to pull again
animation framework