blääää
Merge remote-tracking branch 'origin/simon'

Conflicts:
	feels/feels.xcodeproj/project.pbxproj
fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	feels/feels.xcodeproj/project.pbxproj
	feels/feels/en.lproj/MainStoryboard.storyboard