Initial Commit
Commit 3-4-5
Commit 6
New feature commit
Master 0
Merge branch 'feature'
Feature2 commit
Master merge conflict commit
Merge branch 'feature2'

Conflicts:
	test
Master 12
Merge branch 'master' of https://github.com/bansidhar/test