Berlin branch
Merge pull request #16 from igorw/berlin2

Berlin branch
correct issue with blockquote and add logo
added a gen task to middleman
meetups post template
Merge pull request #17 from papers-we-love/meetup-template

Add gen task to Middleman to allow scaffolding of monthly meetups post
fixed conflicts in index.html.erb
Merge branch 'chapter-data' into chapter-index

* chapter-data:
  meetups post template
  added a gen task to middleman
  correct issue with blockquote and add logo
  Berlin branch