Add the last revisions Phil and I talked about
Merge branch 'master' of github.com:rlyerly/ECE5984_Project

Conflicts:
	phase2/phase2.tex