f
Merge branch 'master' of https://github.com/theprinc/StredmiOS

Conflicts:
	StredmiOS/Base.lproj/Main.storyboard