Added more files
Merge branch 'master' of github.com:zanox/workshop-rebasevsmerge