conflict?
Merge branch 'local-branch-1' of https://github.com/garnetstar/Hello-Word into local-branch-1

Conflicts:
	duncan-idaho.txt