updated test plan
Merge branch 'master' of https://github.com/horsetailfiddlehead/ee478

Conflicts:
	Lab2/phase1.X/nbproject/Makefile-genesis.properties
	Lab2/rs232.X/nbproject/Makefile-genesis.properties