added login feature
merge conflicts
Merge pull request #5 from rantoniops/alan

Alan
Fix merge conflict in seeds.