Updates to main(), fan_update(), etc

Lots of updates that I have already forgotten the specifics of...
Merge remote-tracking branch 'origin/master'

Conflicts:
	Lab6.c