pre-pull
resolve conflicts
now reports version
works
Merge pull request #80 from ryanbahniuk/send_version

Send version