added development.sqlite3 to git ignored files that our two databases are not in conflict
my ddatabase
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/development.sqlite3