adding html master file
merge

Merge branch 'master' of github.com:scollier/summit2014