conflict.txt committed from B1
Merge branch 'master' of https://github.com/n0ahz/Hello-World into B1

Conflicts:
	conflict.txt
Merge pull request #6 from n0ahz/B1

B1