test
Merge branch 'master' of https://github.com/abaddonGIT/woolSaver

Conflicts:
	js/base.js
a