synk
synk
Merge branch 'master' of https://github.com/mikaelrosquist/CinemApp

Conflicts:
	CinemApp/CinemApp.xcodeproj/project.pbxproj
	CinemApp/CinemApp/ProfileViewController.m