finished
Merge branch 'master' into admin_view
Merge pull request #17 from nairys/admin_view

Admin view