changes
AxelChange
AxelChange2
dummy change to provoke a conflict
dummy change to provoke a conflict 2
Merge branch 'master' into myAxelBranch

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master' into nextAxelBranch

Conflicts:
	anotherFile.txt