Progress Report Started
Merge branch 'master' of https://github.com/jbfitz/EECS405
Finished with James' half of progress