wrote some failing tests, I don't know how to make this work
Merge branch 'master' of github.com:katiespiders/SeeMore-Khaki
Merge branch 'master' of github.com:katiespiders/SeeMore-Khaki