Finished addChild.
Merge branch 'dev' of https://github.com/jslinker/CS340 into dev

Conflicts:
	tests/node/NodeTests.java