sasha's changes
Merge branch 'master' of https://github.com/zgushonka/sandBox01

Conflicts:
	sandBox01/sandBox01.xcodeproj/project.pbxproj
	sandBox01/sandBox01/AppDelegate.m