added test1.txt test2.txt test3.txtadded test1.txt test2.txt
test3.txtadded test1.txt test2.txt test3.txt
modified test1 test2 and test3
modified all test.txt by feature A
modified test1.txt
Merge branch 'featureA'

Conflicts:
	test1.txt
	test2.txt
	test3.txt
Merge branch 'master' of http://github.com/fhtw/planitz_ziffer

Conflicts:
	test1.txt