Update table
fix merge
Merge branch 'master' of github.com:chopstickninja/stocky