Confused!
Merge remote-tracking branch 'remotes/origin/new_main_loop'

Conflicts:
	domain/nodes/node.rb
Merge branch 'new_main_loop' of https://github.com/queirozfcom/rachinations
Novo diagrama para discutir
Merge branch 'master' of https://github.com/queirozfcom/rachinations

Conflicts:
	testing/edge_test.rb
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	domain/resource_bag.rb