2323
85
Merge branch 'master' of https://github.com/MakeMD/Sherlock

Conflicts:
	src/com/chemart/sherlock/CopyOfwidget.java