testing GIT #2
Merge pull request #1 from bamiano/master

testing GIT #2