merge
added a client view page which currently has nothing
working on #9