schema 4 with user and userprofile tables
resolve conflict storyboard

Conflicts:
	TutorMeApp/MainStoryboard.storyboard