add in info2 5
Merge branch 'feature_y'

Conflicts:
	info2.txt