sfs
dsaf
Merge branch 'master' into other_conflict

Conflicts:
	secondfile.txt
Merge pull request #3 from marcecaro/other_conflict

Other conflict