Merge branch 'update_cnnarch_cnntrain' into 'master'

updated cnnarch and cnntrain

See merge request !20
2 jobs for master in 4 minutes and 3 seconds
Status Job ID Name Coverage
  Windows
passed #270518
Windows10
masterJobWindows

00:02:07

 
  Linux
passed #270519
masterJobLinux

00:01:55