First attempt to define scenarios for homework 1 1
Add html for merge option
Attempt to make some tests green