Merge branch 'master' of github.com:benjaminabel/django-ipython-nbserver

Conflicts:
	requirements.txt
Merge branch 'master' of github.com:benjaminabel/django-ipython-nbserver

Conflicts:
	requirements.txt