pushed
updated the fixes

Conflicts:
	html/style.css