reset
reset
once again
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	libs/openFrameworksCompiled/project/vs2010/obj/Debug/openframeworksLib.log