update config
Merge branch 'master' of github.com:nclud/sketchbook
fix merge conflict
delete test post