Mechanix Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	eclipse-project/.classpath
Merge branch 'master' of https://github.com/ashwini-mnnit/Sketch-Recognition

Conflicts:
	eclipse-project/.classpath