e
Merge branch 'master' of https://github.com/aulb/aulb.resume

Conflicts:
	resume.tex