Made progress
Merge branch 'master' of https://github.com/Geekdude/Project-Proposal-ECE-357

Conflicts:
	Project-Proposal-ECE-357.tex