Update README.md
Update README.md
Update bdd-jasmine.html
Merge branch 'master' into gh-pages

Conflicts:
	README.md