git is making me commit before i pull. annoying
Merge branch 'master' of github.com:katiespiders/SeeMore-Khaki
working on author search functionality
did stuff with routes
merged