done...almost
Everything should be good. Readme needs to be handed in as well
Merge pull request #13 from Cdingram/master

Everything should be good. Read me is updated + needs to be handed in