tweak makefile
Merge branch '14-html' into 15-task-merging
bug fix regarding not removing 'names' when reusing storage
Merge branch '14-misc-cleanup' into 15-task-merging