JM and Issac's updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	Isaac/HelloWorld.html
	JaiMichael/HelloWorld.html