search minus current user and pagination 'fixes'
Merge branch 'dev' of github.com:winnab/wdi_ga_p2_dating_app into dev
changed factories to be lists not single instances
Merge branch 'staging' into dev
Merge branch 'dev' of github.com:winnab/wdi_ga_p2_dating_app into dev
changing carrierwave settings so that only two images are uploading--to fit the dimensions of seed photos
fix to search and do search methods in controller, refactor form partial
Merge branch 'chore-fix-search' into dev
fix bug in search when user not logged in
Merge branch 'chore-fix-search' into dev
merged conflict in users controller
Merge branch 'dev' of github.com:winnab/wdi_ga_p2_dating_app into dev
fixed bug in users#show when not signed in
carrierwave images
Merge branch 'chore/avatar-size-changes' into dev
switched to single template for search, fixed missing paginate buttons
Merge branch 'dev' of github.com:winnab/wdi_ga_p2_dating_app into chore-fix-search-again
controller changes for registration form
home form ageslider complete
Merge branch 'dev' of github.com:winnab/wdi_ga_p2_dating_app into feature-jquery-ageslider