First commit
added new line
Added a new file called newFile.html
Commit
This is the commit 1 inside bConflict
added a new line
Merge branch 'bConflict'

Conflicts:
	index.html
This is a commit made inside randomBranch
Merge branch 'master' of https://github.com/leo1991/BranchPractice