update of changes
resolving conflict

Conflicts:
	unit3/index.html
	unit3/style.css