corrected
Merge branch 'master' of https://github.com/durs/node-ice

Conflicts:
	lib/ice.node
	package.json