added git info to requried .idea project related files
 minor change in java code to see how git works with potential conflicts
Merge remote-tracking branch 'origin/master'