getaway photo adding complete
fixing those dang merge conflicts