fixed some views
fixing task views
Merge pull request #45 from rarice4/master

fixing task views
fixed merge error in application controller for admin and user login