index page
web app structure
merge conflict solved