checkpoint
Merge branch 'master' of https://github.com/pcmiller/homesources

Conflicts:
	IdeaProjects/src/org/philco/animals/build.cmd
	IdeaProjects/src/org/philco/animals/scanner.java
	IdeaProjects/src/org/philco/cupExample/parser/scanner.java
Checkpoint; not fully working.