error expected
not sure if this works
Merge branch 'master' of https://github.com/honky/SoftwareProjektTUBAF2013

Conflicts:
	README.md fixed everything by deleting bla