Working on login
Merge branch 'local' of github.com:SeederApp/seederapp into local