minor spelling fix in index.html
syncing with master
fixed merge conflict
Merge pull request #3 from tiy-durham-june2014-frontend/mason-branch

Mason branch
Merge branch 'master' of https://github.com/tiy-durham-june2014-frontend/broccoli into mason-branch