project done, turn it in
Merge pull request #2 from eldridger/master

Project is finished