updated for 0072
Merge branch 'master' of https://github.com/bakercp/ofxJSON into bakercp-master

Conflicts:
	.gitignore
	01_twitterExample/Project.xcconfig
	01_twitterExample/bin/data/frabk.ttf
	01_twitterExample/openFrameworks-Info.plist
	01_twitterExample/src/main.cpp
	01_twitterExample/src/testApp.cpp
	01_twitterExample/src/testApp.h
	01_twitterExample/twitterExample.xcodeproj/project.pbxproj
	02_updateExample/Project.xcconfig
	02_updateExample/openFrameworks-Info.plist
	02_updateExample/src/main.cpp
	02_updateExample/src/testApp.h
	02_updateExample/updateExample.xcodeproj/project.pbxproj
	03_flickrExample/Project.xcconfig
	03_flickrExample/flickrExample.xcodeproj/project.pbxproj
	03_flickrExample/openFrameworks-Info.plist
	03_flickrExample/src/main.cpp
	03_flickrExample/src/testApp.h
	README.md
	example-file/Project.xcconfig
	example-file/example-file.xcodeproj/project.pbxproj
	example-file/example-file.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	example-file/openFrameworks-Info.plist
	example-flickr/Project.xcconfig
	example-flickr/example-flickr.xcodeproj/project.pbxproj
	example-flickr/example-flickr.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	example-flickr/openFrameworks-Info.plist
	example-nytimes/Project.xcconfig
	example-nytimes/example-nytimes.xcodeproj/project.pbxproj
	example-nytimes/openFrameworks-Info.plist
	example-stock/Project.xcconfig
	example-stock/example-stock.xcodeproj/project.pbxproj
	example-stock/example-stock.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	example-stock/openFrameworks-Info.plist
	example-twitter/example-twitter.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	lib/include/json/autolink.h
	lib/include/json/features.h
	lib/include/json/forwards.h
	lib/include/json/reader.h
	lib/include/json/value.h
	lib/include/json/writer.h
	lib/src/lib_json/json_batchallocator.h
	lib/src/lib_json/json_internalarray.inl
	lib/src/lib_json/json_internalmap.inl
	lib/src/lib_json/json_reader.cpp
	lib/src/lib_json/json_value.cpp
	lib/src/lib_json/json_valueiterator.inl
	lib/src/lib_json/json_writer.cpp
	libs/include/json/autolink.h
	libs/include/json/config.h
	libs/include/json/features.h
	libs/include/json/forwards.h
	libs/include/json/json.h
	libs/include/json/reader.h
	libs/include/json/value.h
	libs/include/json/writer.h
	libs/jsoncpp/include/json/autolink.h
	libs/jsoncpp/include/json/features.h
	libs/jsoncpp/include/json/forwards.h
	libs/jsoncpp/include/json/reader.h
	libs/jsoncpp/include/json/value.h
	libs/jsoncpp/include/json/writer.h
	libs/jsoncpp/src/json_batchallocator.h
	libs/jsoncpp/src/json_internalarray.inl
	libs/jsoncpp/src/json_internalmap.inl
	libs/jsoncpp/src/json_reader.cpp
	libs/jsoncpp/src/json_value.cpp
	libs/jsoncpp/src/json_valueiterator.inl
	libs/jsoncpp/src/json_writer.cpp
	libs/src/lib_json/json_batchallocator.h
	libs/src/lib_json/json_internalarray.inl
	libs/src/lib_json/json_internalmap.inl
	libs/src/lib_json/json_reader.cpp
	libs/src/lib_json/json_value.cpp
	libs/src/lib_json/json_valueiterator.inl
	libs/src/lib_json/json_writer.cpp
	ofxJSONExamples/001_stock/Project.xcconfig
	ofxJSONExamples/001_stock/openFrameworks-Info.plist
	ofxJSONExamples/001_stock/stock.xcodeproj/project.pbxproj
	ofxJSONExamples/002_twitter/Project.xcconfig
	ofxJSONExamples/002_twitter/openFrameworks-Info.plist
	ofxJSONExamples/003_flickr/Project.xcconfig
	ofxJSONExamples/003_flickr/flickr.xcodeproj/project.pbxproj
	ofxJSONExamples/003_flickr/openFrameworks-Info.plist
	ofxJSONExamples/004_nytimes/nytimes.xcodeproj/project.pbxproj
	src/ofxJSONElement.cpp
	src/ofxJSONElement.h
oops -- fixed some pushed conflicts :(
oops -- pushed some conflicts :(
Merge branch 'master' of https://github.com/jefftimesten/ofxJSON
Merge branch 'master' of https://github.com/jefftimesten/ofxJSON
Merge branch 'master' of https://github.com/jefftimesten/ofxJSON
Merge https://github.com/jefftimesten/ofxJSON into jeff

Conflicts:
	.gitignore