second line added
Merge remote-tracking branch 'origin/bosy2'

Conflicts:
	alice.txt