Begin branching with a new file
Fix a bug
Feature 1 completed
Merge branch 'feature_1'

Conflicts:
	ohyeah.txt