fixed login
Fixed edit activity modal
Merge pull request #46 from TSwimson/fixing_login

Fixing login