hi Joe
fixing silly comments
using documentation format so that test output is more readable
confict resolved
conflict resolved
resolved conflict