Feature 3
Merge branch 'feature2'

Conflicts:
	Hello.txt
Create README.md