Minor changes to index.html and created new object page.
Merge branch 'master' of https://github.com/wesleycho/saam
Fix merge conflicts
Merge branch 'master' of https://github.com/wesleycho/saam