no message
Merge branch 'master' of https://github.com/mmusicante/PlacidoConfArtigos

# By gevargas (1) and javieraespinosa (1)
# Via gevargas (2) and javieraespinosa (1)
* 'master' of https://github.com/mmusicante/PlacidoConfArtigos:
  no message
  no message

Conflicts:
	JournalToSubmit2013/modelingFlyingPig.tex