db stuff almost figured out, bcrypt works
fixed michael merge conflicts