3rd commit

Team one's 3rd commit
Okay? now what? resolved

Conflicts that resolved:
	welcome.html