say hallo
tom was here
new file for test
added wolfgang/workshop
new file added
Merge pull request #11 from unitsche/master

added uli :: say hallo
Merge pull request #9 from wolfgangpfnuer/master

added wolfgang/workshop
Merge pull request #13 from MattiasAlsNix/master

new file added
Merge pull request #12 from TomSp/master

tom was here
Merge pull request #10 from schafstelze/master

new file for test
test by sma
Merge branch 'master' of github.com:devbliss/git-workshop