Conflict on view controller
storyboard and view controller
Merge branch 'feature/SearchFunctionality' into develop

Conflicts:
	NameReminder/ViewController.m