Changed calc() method
This is a test
Changed Person1 in AnLabMain
Merge branch 'original' of https://github.com/ecahill/repository into original

Conflicts:
	M2/src/main/java/edu/gatech/oad/antlab/person/Person1.java
Merge branch 'original' of https://github.com/ecahill/repository into original