confrict
Merge branch 'master' of https://github.com/hr92suteado/gittest2

Conflicts:
	README 2