xx
x
Merge branch 'master' of https://github.com/PetrKarbula/Fotki

Conflicts:
	Fotki.xcodeproj/project.pbxproj
	Fotki/Fotki-Info.plist
	Fotki/MainViewController.m
Final