Initial commit
commit
Merge branch 'master' of https://github.com/lineamentx/django-project

Conflicts:
	COVE/settings.py
	COVE/urls.pyc
breeding calculator
Merge branch 'master' of https://github.com/lineamentx/django-project
Merge branch 'master' of https://github.com/lineamentx/django-project
commit
Merge branch 'master' of https://github.com/lineamentx/django-project
Merge branch 'master' of https://github.com/lineamentx/django-project
Merge branch 'master' of https://github.com/whimsicaldiva/django-project
breeding calculator
fixed retrieve_parent
computed probability
test cases
debugged probability function
debugged probability function
Merge branch 'master' of https://github.com/lineamentx/django-project

syncing