changed something
added encryption login functionality and modified the seed.rb
seperated the password encryption into its own method for defining strength
just resyncing
strengthened the encryption methods
merge conflicts