Added .gitignore
Minor changes
Merge remote-tracking branch 'origin/janki-jpa' into janki-jpa