More convex Charbonnier
Merge branch 'master' of https://github.com/vmlane/6.869Project

Conflicts:
	runner.m