Merge pull request #70 from calebbradley/gh-pages

catch up merges again
Updated Resume
Resume Update
Merge pull request #71 from calebbradley/master

Updated Resume