moded the gitignore file
ht
Merge https://github.com/openframeworks/openFrameworks
simple changes
simple changes
simple stuff
Merge branch 'master' of https://github.com/openframeworks/openFrameworks
Merge branch 'master' of https://github.com/openframeworks/openFrameworks

Conflicts:
	apps/addonsExamples/ofxCvHaarFinderExample/ofxCvHaarFinderExample.xcodeproj/project.pbxproj
	apps/addonsExamples/opencvExample/opencvExample.xcodeproj/project.pbxproj
	apps/addonsExamples/threadedImageLoaderExample/threadedImageLoaderExample.xcodeproj/project.pbxproj
	apps/addonsExamples/xmlSettingsExample/xmlSettingsExample.xcodeproj/project.pbxproj
	apps/examples/advancedEventsExample/advancedEventsExample.xcodeproj/project.pbxproj
	apps/examples/emptyExample/emptyExample.xcodeproj/project.pbxproj
	apps/examples/eventsExample/eventsExample.xcodeproj/project.pbxproj
	apps/examples/fontsExample/fontsExample.xcodeproj/project.pbxproj
	apps/examples/graphicsExample/graphicsExample.xcodeproj/project.pbxproj
	apps/examples/imageLoaderExample/imageLoaderExample.xcodeproj/project.pbxproj
	apps/examples/polygonExample/polygonExample.xcodeproj/project.pbxproj
	apps/iPhoneExamples/graphicsExample/iPhoneGraphicsExample.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/openframeworks/openFrameworks

Conflicts:
	apps/examples/emptyExample/src/testApp.cpp
stop tracking .pbxproj
untrack .pbxproj
untrack .pbxproj
Merge branch 'master' of https://github.com/openframeworks/openFrameworks

Conflicts:
	apps/devApps/_DeployExamples/deployExamples.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/openframeworks/openFrameworks
Merge branch 'master' of https://github.com/openframeworks/openFrameworks
Merge branch 'master' of https://github.com/openframeworks/openFrameworks

Conflicts:
	.gitignore
	apps/devApps/_DeployExamples/deployExamples.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/openframeworks/openFrameworks

Conflicts:
	libs/openFrameworks/types/ofBaseTypes.cpp
Update CONTRIBUTING.md
Merge branch 'master' of https://github.com/NickHardeman/openFrameworks into feature-3dGraphics
Merge branch 'feature-3dGraphics' of https://github.com/NickHardeman/openFrameworks into feature-3dGraphics