Merge pull request #11 from derLukers/master

.tmp folder won't be commited anymore
Fancy Commit Message
Merge branch 'master' of https://github.com/metachris/metalab-git-workshop
Merge pull request #12 from norpol/master

updated README.md
foo
foo
Merge pull request #13 from sixtyeight/master

foo
Bitte eintreten zu dürfen...
participation added
Merge pull request #14 from HelloTree/master

Bitte eintreten zu dürfen...
Merge pull request #15 from queltos/master

participation added
added missing item to readme
Update README.md
changed a line
Merge pull request #17 from hettipeti/master

Update README.md
Merge branch 'master' of https://github.com/kerstin/metalab-git-workshop into kerstin-master

* 'master' of https://github.com/kerstin/metalab-git-workshop:
  added missing item to readme

Conflicts:
	README.md
Merge branch 'kerstin-master'

* kerstin-master:
  added missing item to readme
Merge branch 'mynewbranch' of https://github.com/Maria2/metalab-git-workshop into Maria2-mynewbranch

* 'mynewbranch' of https://github.com/Maria2/metalab-git-workshop:
  changed a line

Conflicts:
	README.md
Merge branch 'Maria2-mynewbranch'

* Maria2-mynewbranch:
  changed a line
trallafitti