Including css file
Creating the html structure
branch commit
including js file
Merge branch 'diestrin' of https://github.com/rodo1111/git-training-onstar into diestrin
Merge branch 'diestrin' into develop
Generating conflict
Resolving conflict