Updated .gitignore
Updated gitignore
Updated gitignore (again). Added readme to db directpry
Merge branch 'master' of github.com:aldlevine/scrum

Conflicts:
	.gitignore
Resolving .gitignore conflict