<Forgot computer during class -_->
Merge pull request #31 from C16erikthompson/master

<Forgot computer during class -_->