added simple logging framework
Merge branch 'logging'