knapsack example (update)
Merge branch 'gh-pages-dev' into gh-pages