added sublime project files to gitignore
fixed merge conflict
fixed image and last name in portland participants yml file
Merge pull request #22 from HeartSongInPurple/gh-pages

Carmen's fixed code (last name and image) -- excellent, thank you for helping get the site fixed!