assignment 3

by: Nate & Dowattie
update
Merge pull request #1 from dowattie/master

assignment 3