add masterfile
Merge branch 'master' of https://github.com/shaftmx/testing into stable