HTML & CSS
Merge branch 'master' of github.com:evildmp/djangocon_europe