added missing item to readme
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
Merge pull request #19 from cygenb0ck/master

trallafitti
                     Tb.          Tb.
                     :256b.        256.
                     :256256b.      :256256b.
                     :256256256b     :256256256b
                      256256256     256256256
                      256256256256b    :256256256
                      :256256256256b---^256256256256b
                      :256256256256        ^Tb
                       256256256256256b    __...__
Merge pull request #20 from stereotype/master

I am Batman! Nananananana
Add lines not good
Merge pull request #21 from mpavel/master

Add lines not good
my workshop
HODOR! HODOR! HODOR!
Merge pull request #22 from scriptythekid/master

HODOR! HODOR! HODOR!
Merge pull request #23 from dajce/master

my workshop
What was your question again?
:'( ... ICH WILL AUCH!
Merge pull request #26 from sssilverrr/master

:'( ... ICH WILL AUCH!