Update 2013-02-02-story3.html
Update 2013-01-27-educate.html
fix merge conflict in stories
typo
Merge branch 'develop' into gh-pages
Merge pull request #150 from ondrae/patch-2

typo
Merge pull request #151 from postcode/develop

Develop
Create livesdinner
Merge branch 'develop' into gh-pages
Merge branch 'gh-pages' of https://github.com/postcode/annual into gh-pages
fix merge conflict in lives story, city --> local gov
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
updating join us layout
new fellowship background
Merge branch 'develop' of https://github.com/postcode/annual into develop