my git ignore
chapter model
Merge remote-tracking branch 'or/master'

Conflicts:
	pages/management/commands/all_imports.py
	pages/templates/pages/header.html
	pages/templates/pages/species_detail.html
My all imports...
Fixtures
Fixtures and import fix
Merge remote-tracking branch 'gal_origin/master'

Conflicts:
	pages/management/commands/all_imports.py
	pages/templates/pages/species_detail.html
fixed translation in 'species_detail.html'