do something
do something more
Merge branch 'master' into foo/test

* master:
  COWS
  forb 4
  forb 3
  forb 2
  forb

Conflicts:
	test.ttxt
Merge pull request #1 from wesen/foo/test

-b:wesen/master