v4
Merge https://github.com/mauck/csc207-hw2

Conflicts:
	PartA.java
	PartB.java
	PartBTest.java
	PartD.java
	TEST.java
	TestPartA.java
	UshahidiPartC.java
Something weird happened, but whatever it was, I THINK it's fixed.