conflict in doc
:Merge branch 'iss2' of https://github.com/chuck1/gru into iss2