cd back to parent directory
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework