adding the markup and styles to a conference.html file to get them to show online
Merge branch 'master' into gh-pages