cancan complete
Merge branch 'dev' of github.com:winnab/wdi_ga_p2_dating_app into dev
both search views complete
pagination complete .. I THINK
pagination commit just incase
sorting out users_show conflict
Merge branch 'feature-loggedin-search-view' into dev