some change, some conflict
Merge branch 'master' of https://github.com/ghoulmann/breif-tech-resume

Conflicts:
	source/conf.py