show view and controller completed
added show functionality and reconciled controller merge conflict