Minor adjustments
Merge branch 'master' of https://github.com/willetsely/cosc301_proj02

Conflicts:
	main.c
Added return statements to functions to make sure they exit at the right point