Merge branch 'trisurf-polyel'

Samo Penic

2014-03-21 ff8152b46e7957beffeafca580abc90df47d9d28

 src/main.c

@@ -49,7 +49,7 @@
      vesicle->dmax=tape->dmax*tape->dmax;
      poly_assign_filament_xi(vesicle,tape);

      if(command_line_args.reset_iteration_count) start_iteration=tape->inititer+1;
      if(command_line_args.reset_iteration_count) start_iteration=tape->inititer-1;
      else start_iteration++;

      if(start_iteration>=tape->iterations){