Merge branch 'master', remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
split resume/upload button into two separate entities
removed some accidental formatting
Merge pull request #131 from dhiltonp/detail-resume

Split Resume/Upload button into two