1418b
1418-2
Merge branch 'master' of github.com:ryangaraygay/gitbranching into branch_r1418

Conflicts:
	helloworld.txt
Merge branch 'branch_r1418' into 1418b

Conflicts:
	helloworld.txt