change in test3, dir6
Merge branch 'master' of github.com:joebennadler/test