Add config/database.yml to .gitignore

Add db config to .gitignore
Merge branch 'master' of github.com:isokcevic/pman

Conflicts:
	.gitignore