I want changes but I messed with tabbing so its making me commit.....
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker
got rid of some errors