Spelled out the first line
fixed error jesus
Merge branch 'master' of https://github.com/vvignale/cs032GitLab

Conflicts:
	foo