made small changes to layout, added logout
fixed merge error in application controller for admin and user login
Merge pull request #46 from belindahare/master

made small changes to layout, added logout to admin