leer
Merge branch 'master' of https://github.com/sh3pp4rd/noname

Conflicts:
	main.cpp
	node.cpp
	node.h