Merge pull request #69 from mxabierto/fixes-agenda

Merge pull request #68 from mxabierto/gh-pages
Merge pull request #70 from mxabierto/gh-pages

Merge pull request #69 from mxabierto/fixes-agenda