1
12
Merge branch 'master' of https://github.com/gronzzz/ifmoMuseum

Conflicts:
	museum/museum.xcodeproj/project.xcworkspace/xcuserdata/vitaliyzarubin.xcuserdatad/UserInterfaceState.xcuserstate