Syntax fixes and your mother
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assigment3/Assignment3.html
	Assignment4/Assignment4.html