add stuff on master
add second feature
Merge branch 'feature2' of github.com:scjody/github-test into feature2