Added comments to index.html, functions.php, and script.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	Lab2/functions.php