added proper potentials based on user pref
trying to merge
votee batch created
fixed method in user
fixed merge conflict
removes authentication method from application controller
still broken
fixed merge conflicts
working. need to double check random user gernerator algorithm
fixed bug in algorithm
Fixes merge conflicts in schema, and user model