commit from frontend branch
further commits from master
Commit from backend branch
modified index.html from backend
Merge branch 'frontend' to 'master'