new
Merge remote-tracking branch 'origin/master'

Conflicts:
	papers/gpce2013/gpce2013.tex
new conclusion