added gitHub
added again gitHub
fixed merge error
Merge pull request #1 from AUAJ/fromGitHub

From github pull test