1.0
Merge branch 'master' of https://github.com/fdully/bnet

Conflicts:
	index.js
1.0