added formatting to resume
Merge branch 'comp20'