commit 1
Completed Person1 calc() method
changed Person4
Changed calc() method
Merge branch 'master' of https://github.com/ecahill/repository into original
Completed Person5 method implementation
Merge remote-tracking branch 'upstream/master' into original
Completed Person3

Implemented the calc method in person 3
Deleted useless.p4.txt
Deleted useless.p3.txt
Deleted useless.p2.txt
Deleted useless.p1.txt
This is a test
Updated Person5 in AntLabMain.java
modified person4
Merge branch 'original' of https://github.com/ecahill/repository into original
Created readme.p5.txt
Merge pull request #1 from ecahill/original

changed Person4
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