started implementing haystack search with heroku searchbox
merge conflicts
merge conflicts
merge conflicts
added haystack settings
template error
reorganized search templates
trying to get search to work
GA