gpuimage added
Added root view and initial graphics
provisioning profile stuff
Added fonts
stuff
Fonts category
Work
filter stuff
Merge remote-tracking branch 'origin/hannes'

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

Conflicts:
	feels/feels.xcodeproj/project.pbxproj
	feels/feels/en.lproj/MainStoryboard.storyboard
stuff
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
Camerar
Merge branch 'master' of github.com:hellozimi/feels into simon

Conflicts:
	feels/feels.xcodeproj/project.pbxproj