..
...
Merge branch 'master' of https://github.com/mrzmmr/nwrite

Conflicts:
	index.js