Simple git exercise, Exercise 16.
Merge branch 'master' of github.com:MarkAYoder/gitLearn

Conflicts:
	helloWorld.c