sixth report
seventh report
Merge branch 'master' into gh-pages

Conflicts:
	study06/jquery.html
	study06/jquery.js