Acomodando
Merge branch 'master' of github.com:briseida/poster

Conflicts:
	poster2.tex