beginnin gof stuff

e
Merge branch 'master' of https://github.com/horsetailfiddlehead/ee478

Conflicts:
	Lab2/phase1.X/dist/default/production/phase1.X.production.cof
	Lab2/phase1.X/dist/default/production/phase1.X.production.map
	Lab2/phase1.X/main.c
	Lab2/rs232.X/nbproject/Makefile-genesis.properties