Merge branch 'master' of https://github.com/javali7/paper-1

Conflicts:
	Euro2014.log
	Euro2014.pdf
	Euro2014.synctex.gz