added documentation
added today's work

really incomplete; have lots to fix
Merge remote-tracking branch 'upstream/master'