build
fix conflicts

Merge branch 'master' of github.com:EDiLD/taxize_poster

Conflicts:
	poster.pdf