Part 4 bullshit, you know it
Merge remote-tracking branch 'origin/bullshit'

Conflicts:
	proj/MCCNode.java
	proj/RPCNode.java