updated gitignore and removed tracking of unneeded idea files from repo
merged