change Date.today to a set date in tests
remove ignore files
fix merge conflicts
merge with search controller