final draft 4
Merge pull request #10 from iomahony/1

final draft 4
Merge pull request #11 from iomahony/master

merging