commiting to pull
Merge branch 'master' of github.com:AmandaSutherland/ShoeStalker
fixing to push