added sublime project files to gitignore
fixed merge conflict for gitignore
restoring Virginia Thayer participant info after snowstorm
removing conflict with .gitignore
Merge branch 'vthayer-gh-pages' into gh-pages