+conv_net- trainer
Merge remote-tracking branch 'origin/master'