fixed some typos
initial commit of ipf branch
commit before switching to master
ipf running, ipf stops for max iter and threshold
everything ok
still fixing up the example
basic ipf done
Resolved conflicts.
Merge branch 'samurain-master'

Merging ipf into master.