Merge pull request #3 from weaties/mytopic

adding on a topic branch
making some conflict
Merge pull request #4 from weaties/topic2

making some conflict
fixing the merge conflict, seeign what it does to the pull request