More write-up stuff
Added charbonnier penalty
Merge branch 'master' of https://github.com/vmlane/6.869Project

Conflicts:
	FlowIter.m
	flowNIter.m
prepare for merge fixes
Merge