Redesign
Video update
Merge pull request #25 from jtinfant/master

Team 1 Final Submission