commit
Merge pull request #13 from hoodiegeek/master

Final submission