commit after merge

diff --cc src/Test/deserializersolvetest.cc
index 5498f8440539f6ca34cac76684097301da6a2e12,0f35d127b3ccde3f85a981e5e874796f59da4957..2a2910fa7de1b74f06bc4b3de85b52ec7c9f3e05
mode 100755,100644..100644
--- 1/src/Test/deserializersolvetest.cc
--- 2/src/Test/deserializersolvetest.cc
+++ b/src/Test/deserializersolvetest.cc
@@@ -1,19 -1,15 +1,16 @@@
  #include "csolver.h"
 -
 +//#include <unistd.h>
 +//#include <sys/types.h>
  
- int main(int argc, char ** argv){
-       if(argc < 2){
+ int main(int argc, char **argv) {
+       if (argc < 2) {
                printf("You should specify file names ...");
-               exit(-1);       
+               exit(-1);
        }
- //    printf("I am pid %d!\n", getpid());
- //        usleep(20000000);
- 
-       for(int i = 1; i < argc; i++) {
-               CSolver* solver = CSolver::deserialize(argv[i]);
-               int value=solver->solve();
-               if (value ==1) {
+       for (int i = 1; i < argc; i++) {
+               CSolver *solver = CSolver::deserialize(argv[i]);
+               int value = solver->solve();
+               if (value == 1) {
                        printf("%s is SAT\n", argv[i]);
                } else {
                        printf("%s is UNSAT\n", argv[i]);