blah
Merge branch 'master' of https://github.com/clarafj/cnn_switch