intra check
Merge branch 'master' of https://github.com/shanewiseman/TechJam.git

Conflicts:
	src/test/java/com/akamai/techjam/distributedsystem/TreeTests.java

	new file:   client/Makefile
	new file:   client/client.c
	new file:   client/unittest.c
	modified:   src/main/java/com/akamai/techjam/distributedsystem/Tree.java
	modified:   src/test/java/com/akamai/techjam/distributedsystem/NodeTests.java
	modified:   src/test/java/com/akamai/techjam/distributedsystem/TreeTests.java