login changes
Merge branch 'master' of https://github.com/mahjouri/DogSitter
home page buttons
options
conflicts
login methods