Let's see what happens...
Merge branch 'master' of github.com:diegollarrull/git_talk

Conflicts:
	file2.txt

Note: never do this again!!!