Merge branch 'master' of github.com:gnuwilliam/django-rest-tutorial

* 'master' of github.com:gnuwilliam/django-rest-tutorial:
  finish serializer

Conflicts:
	snippets/serializers.py
Merge branch 'master' of github.com:gnuwilliam/django-rest-tutorial

* 'master' of github.com:gnuwilliam/django-rest-tutorial: