Updated Resume
Merge remote-tracking branch 'origin/master'

Conflicts:
	TexResume/resume.pdf
	TexResume/resume.tex