rebasing
update gitignore to ignore the .idea folder.
Merge remote-tracking branch 'origin/master'