Store users, not individuals.
Cleaning up last.
Merge branch 'master' of github.com:chmullig/AXIAL

Conflicts:
	src/Axial.java
Merge branch 'master' of github.com:chmullig/AXIAL