Test Plan Design Doc
Merge branch 'master' of github.com:horsetailfiddlehead/ee478

Conflicts:
	Lab2/newDesignDoc.doc