Merging again because I was merging in detached state

Samo Penic

2016-12-06 c2c6364dc7d23f21dabd2179e775e93ba4eeb252

 src/energy.c

@@ -228,7 +228,7 @@
   ynorm/=norml;
   znorm/=norml;
   /*calculate ddp, perpendicular displacement*/
   ddp=xnorm*(vtx->x-vtx_old->x)+xnorm*(vtx->y-vtx_old->y)+znorm*(vtx->z-vtx_old->z);
   ddp=xnorm*(vtx->x-vtx_old->x)+ynorm*(vtx->y-vtx_old->y)+znorm*(vtx->z-vtx_old->z);
   /*calculate dE*/
//   printf("ddp=%e",ddp);
   return vesicle->tape->F*ddp;