commit 1
commit 3
Merged 3 and 1 to get something i want

Conflicts:
	two.html
u1
1 and 2

Conflicts:
	two.html
u3