Commit to solve pull error
1) Merge (conflicts: HeapFileTests.java)
2) Predicat's evaluate method has been implemented and tested