testing travis (not notifying)
Merge branch 'master' of github.com:jseto/jsLib

Conflicts:
	.travis.yml