merge changes

Tino Hager

2018-06-27 ab5368e2795c3340aa8d7a12f973773572ceb28a

 src/avgpool_layer.h

@@ -2,9 +2,9 @@
#define AVGPOOL_LAYER_H

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

typedef layer avgpool_layer;