added sublime project files to gitignore
added sublime project files to gitignore
edited .gitignore
ignorming sublime text project files
fixed my entry in portland_participants
this work 11:53
Merge https://github.com/mozilla/ascendproject into gh-pages
update from ascendproject
fixing merge conflict
fixed merge conflict
added my image
fixed merged conflict
fixing snowperson's hack and adding my participant dir
added last name and image
image uploaded
fixed image and last name in portland participants yml file
added picture
change made in bio
Merge pull request #21 from melres/gh-pages

Thanks for the fix, Mel!
Merge pull request #18 from ninaalcaras/gh-pages

Nina, thanks for helping clean up after the hackers :)