pr
Merge branch 'master' of https://github.com/abaddonGIT/woolVisualizer

Conflicts:
	js/main.js
end