Merge pull request #3 from emblaser/hw

Completed v-1 without testing
Merge pull request #7 from emblaser/V1complete

V1complete
Version3, needs cleanup but no known bugs
Merge pull request #8 from emblaser/Joseph

Version3, needs cleanup but no known bugs
saving progress
Merge branch 'master' of https://github.com/emblaser/HW6 into V1complete

Conflicts:
	PopulationQuery.java

First draft of V2
Don't merge this commit! Showing v1 bug on 1-1-100-500