edits
Merge branch 'master' of github.com:mtholder/PhyPatClassProb

Conflicts:
	images/poster-2013.tex
Merge branch 'master' of github.com:mtholder/PhyPatClassProb
Bibtex