added file3
Merge branch 'foo_feature'

Conflicts:
	file3