Trying to refactor the code, removing unwanted stuff
changing secondPage to landing-page.html
Resolving conflicts
changing the name of controllers