ride the poo poo train
Merge branch 'master' of https://github.com/CSC-3320-Fall/Assignment6

Conflicts:
	mhays1/helloworld.c