11
Merge branch 'master' of https://github.com/comrade110/iFc

Conflicts:
	iFc.xcodeproj/project.pbxproj