Playin around
Merge branch 'master' of https://github.com/qdonnellan/restful_django

Conflicts:
	db.sqlite3