Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages
Changing the Lanyrd button to Eventbrite button
Merge branch 'dev' into gh-pages
updating past events
Updating the OGN homepage
Update 2014-03-16-ogn35.markdown
Merge branch 'dev' into gh-pages

Conflicts:
	_includes/event-actions.html
Typo fixed
Typo fix fix
Added keynoters for previous list of ogns
Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages
OGN37
Merge branch 'gh-pages' into dev