Updated the Folkman log
Updated the SAT document - finish in the AM with Folkman stuff.
Fixed merge