Merge remote-tracking branch 'origin/hannes' into simon
Merge remote-tracking branch 'origin/andreas' into simon
App Icon bitches!
Merge remote-tracking branch 'origin/simon' into hannes

Conflicts:
	feels/feels.xcodeproj/project.pbxproj
prepare for background track
Merge branch 'andreas' of github.com:hellozimi/feels into simon
Rotating the menu arrow
Parallax on the video! Amazing!
added audio
timing
Merge branch 'hannes' of github.com:hellozimi/feels into simon
Merge branch 'andreas' of github.com:hellozimi/feels into simon

Conflicts:
	feels/feels.xcodeproj/project.pbxproj
	feels/feels/Camera stuff/CameraViewController.m
Defines, User Defaults for points
Merge remote-tracking branch 'origin/andreas' into hannes
Merge branch 'hannes' of github.com:hellozimi/feels into simon
Stuffffff
stuff
Merge branch 'andreas' of github.com:hellozimi/feels into simon

Conflicts:
	feels/feels.xcodeproj/project.pbxproj
work
updated gitignore