initial commit
new change to test2
Merge branch 'master' of https://github.com/daniel666/test2
This is useful for testing