"Galen has implemented the code for Person5.java - it has not yet been tested"
"Fixed bug in calc method"
"Merging origin and master brances"
Merge remote-tracking branch 'origin'