synk
Merge branch 'master' of https://github.com/yuranevmer/Matchizmo1

Conflicts:
	Matchizmo/AppDelegate.m