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
Added HC animator, and ticking milli seconds
Saving points when entering background
tams
trams
Merge remote-tracking branch 'origin/simon' into andreas

Conflicts:
	feels/feels/Camera stuff/CameraViewController.m
	feels/feels/en.lproj/MainStoryboard.storyboard
More millisec logics.
Merge branch 'hannes' of github.com:hellozimi/feels into simon

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