...
...
Merge branch 'node' of github.com:lstopar/qminer

Conflicts:
	autom4te.cache/output.0
	autom4te.cache/requests
node building