Fixing Whole code
what

Conflicts:
	MainStoryboard.storyboard