2nd
Merge branch 'master' of github.com:aerkefiende/myfirstgit

Conflicts:
	hello.txt