ignore crap
aaa
Merge branch 'master' of https://github.com/cristiursachi/testRepo

Conflicts:
	myfirstHello.txt