Genoveva 1701
Merge branch 'master' of https://github.com/mmusicante/PlacidoConfArtigos

Conflicts:
	JournalToSubmit2013/main.aux
	JournalToSubmit2013/main.log
	JournalToSubmit2013/main.pdf
	JournalToSubmit2013/main.synctex.gz