storyboard
Merge branch 'master' of https://github.com/GndFloor/FittrIOS2

Conflicts:
	Fittr/en.lproj/MainStoryboard.storyboard