Junk

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

Conflicts:
	Lab2/phase1.X/main.c