learning rebase on branch dufrense
errors
Merge branch 'dufrense' of github.com:xiongyan/cats into HEAD

Conflicts:
	manage.py