Merge pull request #24 from CalvinRodo/fixing_admin

Fixing admin
Merge pull request #25 from CalvinRodo/master

Fixing admin