conference page part one added
Merge branch 'master' of https://github.com/oookli/marco-polo-template