change from local repo
Merge branch 'master' of https://github.com/elghamourou/my_github

Conflicts:
	README.md