try-commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	bioinf_project/db.sqlite3
Merge remote-tracking branch 'origin/master'

Conflicts:
	bioinf_project/db.sqlite3
Merge remote-tracking branch 'origin/master'

Conflicts:
	bioinf_project/db.sqlite3