deleted extra stuff from users undex
Merge branch 'dev' of github.com:jodykingzett/Breedr into dev
worked on user show and user index
Merge branch 'dev' of github.com:jodykingzett/Breedr into dev
Merge branch 'dev' into chatroom
added in emails to notify user if they have been liked
status validations working
tinkering with user search index
Merge branch 'dev' of github.com:jodykingzett/Breedr into dev
Merge branch 'dev' into chatroom
styling and tinkering with links to showing all users, blind date
Added a matches page with the route localhost/my_matches. This allows one to view all the people they have matched with.
Merge branch 'matches' into dev
added photo to welcome page and changed a few things
resolved conflist in user undex
resolved conflicts in user index and messages form
code added but not tested
conflicts resolved
kaminari pagination working
working on distance function, got http results