wq
x
added testing code before merge
Merge branch 'master' into nate-cnn
finished implementing validation and testing of nate cnn