new feature
Merge branch 'new_feater'
changing spelling of fat
changing fat to obese
Merge branch 'conflict_branch'

Conflicts:
	new file.txt