end of the night commit
Merge branch 'master' of https://github.com/Its-a-Trap/My-Face-iOS