Things work? At least parts do. We need to combine to hopefully fix our individtual errors
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker