Resolve Conflist
Merge branch 'master' of https://github.com/ashwini-mnnit/Sketch-Recognition