added two files and changed index.html some
Merge branch 'matt'

* matt:
  added two files and changed index.html some
Merge branch 'master' of github.com:everestps/branching

* 'master' of github.com:everestps/branching:
  Added index.js

Conflicts:
	index.html