ipython integration, use: python manage.py shell_plus --notebook
Merge branch 'master' of https://github.com/tcab/django_test1

Conflicts:
	django_test1/settings.py
serializing Article model OK
am able to call the rest api to get articles
misc db and notepad changes