All sorts of uploady goodness.
Merge branch 'master' of https://github.com/bhc24/EECS_393_Project