Update
Merge branch 'master' of https://github.com/n1k0laj/ios_training

Conflicts:
	ios_training/ios_training.xcodeproj/project.pbxproj
update