restructure
Merge branch 'master' of https://github.com/aaronnech/LifeCalc

Conflicts:
	src/java/TheGorrie.java
Merge branch 'master' of https://github.com/aaronnech/LifeCalc