Edited .gitignore; added .idea directory.
Merge remote-tracking branch 'origin/master'