Removed comma from to string of Conflict. Minor
Updated get predicates to get everything
Revert "Finished getPredicates"

This reverts commit 54d90f38a7730e087499bb218cae921f63ad1de5.
Merge remote-tracking branch 'origin' into nathan
Fixed to dos in Lab haha oops. Also fixed export to ".out" file instead of original...