Committing extra stuff for iteration 2
Merge pull request #23 from Hartman2/master

Committing extra stuff for iteration 2