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
howdy 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

Conflicts:
	participants/portland/maryanne/_posts/2014-09-19-cookiecrumbs.md
fri
Merge branch 'gh-pages' of https://github.com/mozilla/ascendproject into gh-pages
fixed merge comflict
Merge pull request #166 from maryannet/gh-pages

Merged #166