conflicts resolved
Merge pull request #6 from FroggyMe6581/petersCommits

conflicts resolved