Changed messaging options
Merge branch 'master' of github.com:vuphamcs/shelter_finder