Commit ti try to pull from repo
comit
second commit
yaya
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	apps/ofTest/mySketch/bin/mySketch_debug.exe
	apps/ofTest/mySketch/bin/mySketch_debug.exp
	apps/ofTest/mySketch/bin/mySketch_debug.lib
	apps/ofTest/mySketch/src/terrainShader.h
	libs/openFrameworksCompiled/lib/vs2010/openframeworksLibDebug.lib
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/CL.read.1.tlog
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/CL.write.1.tlog
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/Lib-link.read.1.tlog
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/Lib-link.write.1.tlog
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/cl.command.1.tlog
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/lib.command.1.tlog
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/of3dUtils.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofAppGlutWindow.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofAppRunner.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofArduino.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofBaseSoundPlayer.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofBaseSoundStream.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofBaseTypes.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofBitmapFont.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofCairoRenderer.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofCamera.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofColor.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofDirectShowGrabber.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofEasyCam.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofEvents.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofFbo.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofFileUtils.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofFmodSoundPlayer.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofGLRenderer.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofGraphics.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofImage.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofLight.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofLog.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofMaterial.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofMath.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofMatrix3x3.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofMatrix4x4.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofMesh.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofNode.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofPath.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofPixels.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofPoint.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofPolyline.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofQtUtils.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofQuaternion.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofQuickTimeGrabber.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofQuickTimePlayer.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofRectangle.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofRtAudioSoundStream.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofSerial.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofShader.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofSoundPlayer.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofSoundStream.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofSystemUtils.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofTessellator.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofTexture.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofThread.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofTrueTypeFont.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofURLFileLoader.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofUtils.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofVbo.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofVboMesh.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofVec2f.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofVec4f.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofVideoGrabber.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/ofVideoPlayer.obj
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/openframeworksLib.lastbuildstate
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/openframeworksLib.log
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/vc100.idb