An initial test commit
now github will not cry
Merge branch 'master' of https://github.com/n-r-test/test