tinkering with conclusion
Merge branch 'master' of github.com:jgbm/cpgv

Conflicts:
	concur2014/main.tex