test commit
Merge branch 'master' of https://github.com/Alys/habitrpg-tools

Conflicts:
	README.md
test 1