Merge pull request #17 from vossgang/matt-copy

Matt copy
Merge pull request #18 from vossgang/matt-copy

ditch nslog
added user edited