errors in the my_likes index - work out poetntial conflicts
Merge branch 'dev' of github.com:jodykingzett/Breedr into dev
 just checking that have it up to date, not much done