upload
Merge branch 'manual-anim' of https://github.com/vitrum/www into manual-anim