Working on admin part
...
Almost done with admin.
Almost...
Merge pull request #8 from Xardas1111/master

Catch