adding fouert line
Merge branch 'master' of https://github.com/Sterntaufe/Testrepo

Conflicts:
	fileA