Finish REST framework tutorial 4
Merge branch 'master' of github.com:buendiya/mysite

Conflicts:
	db.sqlite3
	restSnippets/serializers.py
	restSnippets/views.py
update