Use kinoli fix for issue #4
Implement takePhotoOrVideoOrChooseFromLibrary finally
Fix backwards compatibility with iOS4
.gitignore is now working
Fix takePhotoOrVideoOrChooseFromLibrary with right tag and settings.
Fix missing localized string
Add allowsEditingPhoto and allowsEditingVideo
ImageOptim
clean up workspace
Merge branch 'dothisaftermerge'
update localization
update sameple app for API change
Update README.md

actually use markdown
Add french localization
Merge pull request #7 from guillaume-algis/localization-fr

Add french localization
translate to French

Thanks Guillaume Algis
Merge remote-tracking branch 'upstream/master'

Conflicts:
	FDTakeExample/FDTakeController.m
bump podspec to 0.0.2