Ignored development.sqlite3
Edited GitIgnore
Merge branch 'iss26' of https://github.com/florianb/patient-situation into iss26

Conflicts:
	db/development.sqlite3