control statements and main clean up
Merge remote-tracking branch 'origin/master'

Conflicts:
	Lab5.c