Edit package
Merge branch 'master' of github.com:zuzak/utsire

Conflicts:
	package.json