error messages
Merge branch 'master' of https://github.com/katiespiders/SeeMore-Khaki
stuff
stuff