krock med andreas
wwwwwwwwww
:x
:q
q
eweqMerge remote-tracking branch 'origin/simon' into andreas

Conflicts:
	feels/feels/Camera stuff/CameraViewController.m
	feels/feels/en.lproj/MainStoryboard.storyboard