Merge branch 'master' of https://github.com/robertt89/findmydog.git