editting
Merge branch 'master' into working
done for the animation og the cateory
Merge pull request #130 from liafailboy/working

Working