Merging again because I was merging in detached state

Samo Penic

2016-12-06 c2c6364dc7d23f21dabd2179e775e93ba4eeb252

 src/general.h

@@ -258,6 +258,7 @@
   long int nczmax;
   long int npoly;
   long int nmono;
   long int internal_poly;
   long int nfil;
   long int nfono;
   long int R_nucleus;
@@ -287,6 +288,7 @@
   long int number_of_vertices_with_c0;
   ts_double c0;
   ts_double w;
   ts_double F;
} ts_tape;