second commit
config file added
.gitat change
Merge branch 'master' into beta