okay Merge branch 'gh-pages' of https://github.com/mozilla/ascendproject into gh-pages
fri Merge branch 'gh-pages' of https://github.com/mozilla/ascendproject into gh-pages
fix
 fixes
 Merge branch 'gh-pages' of https://github.com/mozilla/ascendproject into gh-pages
friday slowly catchingup
monday sunny day start offMerge branch 'gh-pages' of https://github.com/mozilla/ascendproject into gh-pages
fixing typos
changes and blog
howdy Merge branch 'gh-pages' of https://github.com/mozilla/ascendproject into gh-pages
Merge branch 'gh-pages' of https://github.com/mozilla/ascendproject into gh-pages
wtf am i committing to?
Added two blog posts
Updated blog post
Merge branch 'gh-pages' of https://github.com/mozilla/ascendproject into gh-pages
Merge pull request #158 from bugzPDX/travis

Added two blog posts
Merge branch 'gh-pages' of https://github.com/mozilla/ascendproject into gh-pages
O_o
updated working images
fri Merge branch 'gh-pages' of https://github.com/mozilla/ascendproject into gh-pages

Conflicts:
	participants/portland/maryanne/_posts/2014-09-19-cookiecrumbs.md
fixed merge conflict