integrating convnet
Merge branch 'remco' of https://github.com/software-engineering-amsterdam/DSRC-MachineLearningInTheBrowser into remco