something I forgot to check in yesterday
Merge branch 'master' of github.com:jgbm/cpgv

Conflicts:
	places2014/cpgv.tex