testing
Merge branch 'master' of https://github.com/vrooje/gzcandels-bars

Conflicts:
	gzcandels-bars.pdf
	gzcandels-bars.tex

I feel like I'm not doing this right.