made changes to junk2
Merge branch 'master' of https://github.com/alfredd/Hello-World

Conflicts:
	junk/junk2.txt