...
Merge pull request #60 from gitnasty/git_reconciliation

...