Update

Mini updates
Merge pull request #21 from tcharles411/master

Team 3 final pre-design commit