fixed
Fixed merge conflix
Merge branch 'master' of github.com:bradpsheehan/daughter_of_store_engine