Återskapat settings
Project-filen
Conflict

Conflicts:
	CinemApp/ProfileViewController.m