Merge branches 'email-link', 'move-about' and 'experience-on-top' into beardtree

Conflicts:
	resume.template