added my name and date
changes
Merge branch 'master' of https://github.com/glennodell/Web_Programming_Fundamentals

Conflicts:
	associatingJS/JS/scripts.js
	associatingJS/index.html