Predicate and Filter done
added gitignore
delete swp file
remove class files
Fixed merge conflicts
Merge branch 'Lab2'
Merging with Lab2 branch
Fixed another issue with merge