added nan check
Merge branch 'master' of github.com:AlisaEx/calculatorAdventures

Conflicts:
	test.js