test
Merge branch 'master' of https://github.com/artemshekh/chemproject

Conflicts:
	canvas/canvas.js
Merge branch 'master' of https://github.com/artemshekh/chemproject
delete unused code