edits to title
web update to index.html
merging!
Merge pull request #2 from danjunger/front-end-conflict

Front end conflict