Ignore files generated by maven release plugin
Merge remote-tracking branch 'origin/master'