added object and mediator
added trollface
added comments
added log
updated master - waiting implementation