working on feature 3
testing tags
Merge branch 'master' of https://github.com/tomhundley/gittest