analysis
changed
Merge branch 'master' of https://github.com/airobert/aa2

Conflicts:
	poster.aux
	poster.log
	poster.pdf
	poster.tex
force merge