Merge pull request #20 from lucidNTR/gh-pages

spring drinks merge
mai 2013 talks