change .gitignore. Add eclipse and idea
Merge remote-tracking branch 'origin/master'