add windows test conflict
Merge branch 'master' of github.com:solde9/dataentry.js

Conflicts:
	scripts/dataentry.js