This is my first commit
This is my second commit
Moved lisa directory to correct directory
Merge branch 'gh-pages' of https://github.com/mozilla/ascendproject into gh-pages
Fixed incorrect bio information for Lisa Hewus Fresh

I noticed that an evil snowperson changed my bio information.
I corrected my last name and inserted my image file.
First commit
added sublime project files to gitignore
added sublime project files to gitignore
added sublime files to gitignore
added sublime project files to gitignore
added sublime to ignore
added sublime files to gitignore
this is my gitignore
Merge https://github.com/mozilla/ascendproject into gh-pages
Merge branch 'gh-pages' of https://github.com/mozilla/ascendproject into gh-pages
Merge https://github.com/mozilla/ascendproject into gh-pages
Merge https://github.com/mozilla/ascendproject into gh-pages
Merge https://github.com/mozilla/ascendproject into gh-pages
fix merge conflict in gitignore
fixed merge conflict for gitignore