put it all together on index.html
Merge branch 'putting-it-together'

* putting-it-together:
  put it all together on index.html