Merge branch 'master' of https://gitlab.com/starkingdoms.tk/starkingdoms.tk
add client
haha am idiot, needed to pull again
animation framework
rendering traits