renames demo/ to assets/
Merge branch 'dev' of github.com:aaasen/kapok into dev