Merge pull request #7 from buren/pull_state

Updated ready-execute to handle merge conflicts and run test suite if re...
Merge branch 'master' of github.com:buren/git-story into pull_state