Added .idea/ and .DS_Store to .gitignore
Merge remote-tracking branch 'origin/master'