Updated .gitignore

Removed the all the things of gitignore and added the .idea dir to not
be committed
Merge remote-tracking branch 'origin/master' into DB