Merge pull request #1 from benebun/master

fix swapped django/nginx urls
Fixed url to blog post
Merge pull request #2 from antonpirker/patch-1

Fixed url to blog post
+ adding slides and code from clemens
+ adding empty folder for drazen's slides?
Update notes.md
Update notes.md
Update notes.md
Update notes.md
+ adding stub for benedikt
+ added READMe.md to angularjs+django folder
Merge branch 'master' of github.com:stephanpoetschner/django-friends-vienna
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
docker-py presentation
Merge pull request #3 from kermit666/docker

docker-py presentation
slides for my talk