Person6 and stuff

changed method
Person6 calc() modified

Changed string method
Merge branch 'master' of https://github.com/bobzilla2340/M2
Merge pull request #1 from bobzilla2340/tree-branch

Tree branch
Changed indenting and added comments
addin mah readme -julia
Merge branch 'master' into tree-branch

Conflicts:
	src/main/java/edu/gatech/oad/antlab/pkg1/AntLabMain.java