6/8 retooling site
Merge branch 'master' into gh-pages

Conflicts:
	chapter7.html
	css/stylesheet.css
	faq.html
	index.html
	meanstesttravis.html
	meanstesttravis.js
	testimonials.html