change to test.js
commit master
Merge branch 'master' of https://github.com/Dres90/tourngen

Conflicts:
	test.js