Add test
Merge
Merge branch 'master' of https://github.com/brianweet/Toos

Conflicts:
	TOOS1/src/Census.java
...