Updated package.json
Merge branch 'master' of github.com:reduardo7/sjsClass

Conflicts:
	package.json