Created file1
Added second_feature
Added master to the end
Merge branch 'second_feature'

Conflicts:
	file1