make sure local repo is in sync before commiting
Merge branch 'master' of github.com:thinkdeciduous/engblog