new changes
Merge branch 'master' of https://github.com/foxish/AggieExperts into search_page_it2
limiting results per page
Modified the style of the search on the form in the search page, added the clearance gem, overrode controller classes and generated views, added new db migration, commented out seeds
Added seeds with bcrypt password hashing, changed the user model, added migration to remove the password field from the users table and replace it with encrypted_password
Added new images for the dropdown, changed a couple of styles to match the theme of the application, added new partials for authenticated and unauthenticated views
search based on priority but with duplication
search term without duplications
Completed the authentication partial, fixed styles associated, authentication now possible
Finished login styles, login button, login dropdown, handling of sessions, routes and partials
Removed unused session views, fixed spacing in the application template
Tiny modification to the admin/main page, to read user id in different way. Changed the sessions controller to redirect to the admin page in case the admin role is detected. Some methods in the model may need to change to do this in a cleaner way
done with split on space and search based on each word
Merge branch 'master' of https://github.com/foxish/AggieExperts into search_page_it2
done with disable users but just on name
done with disabled users on all 3 entities
modification to keyword search for disabled users
more modifications
Fixed small bug in the sign_up action
merge conflict