fixed merge conflicts
Merge branch 'master' of github.com:jemaddux/son_of_store_engine