Started webpage sprint2
Resolved conflict