added seed and added bcrypt
fixed merge errors
Merge pull request #8 from catherinev/seeds

Seeds done.