feature 3
master 4
Merge branch 'feature' resolve conflict

Conflicts:
	obama.txt