feature complete
Merge branch 'master' of https://github.com/paneer/img_rec_test