Day 2: Commit 1 Master
Day 2: Commit 1 Feature
Merge branch 'feature'

Conflicts:
	test
After Feature branch