testing commit -a
Merging Master with my branch
Merge remote-tracking branch 'upstream/master'
Trying to decide which email API to use
Because to use apache-commons we need to parse the inputStream