merge changes

Tino Hager

2018-06-27 ab5368e2795c3340aa8d7a12f973773572ceb28a

 src/deconvolutional_layer.h

@@ -2,10 +2,10 @@
#define DECONVOLUTIONAL_LAYER_H

#include "cuda.h"
#include "params.h"
#include "image.h"
#include "activations.h"
#include "layer.h"
#include "network.h"

typedef layer deconvolutional_layer;