master add origin
Merge branch 'feature_y'

Conflicts:
	info2.txt
changed something again
Merge branch 'master' into feature_y