adding an admin controller for the admin dashboard
added a view for the dashboard
fixing merge conflicts
Merge pull request #19 from afalsario/afalsario

Afalsario