.gitignore added
Merge remote-tracking branch 'origin/master'
Removed .idea folder