homepage content tweaks
Merge branch 'master' of https://github.com/meara/brain_trade into edit_page_rendering
conditional render on meetup edit page
Merge pull request #38 from meara/edit_page_rendering

Edit page rendering
fixed merge conflict