Add .gitignore
Merge branch 'janki-ormlite'

Conflicts:
	.gitignore
Minor layout fix