edited in git
Merge pull request #1 from andyjones/feature/from_git

edited in git