commit
commit
Merge branch 'workshop-6'

Conflicts:
	Selfy/Selfy/SLFTVController.m
sliding settings