Merge pull request #18 from lucidNTR/gh-pages

my february talk
Merge pull request #19 from lucidNTR/gh-pages

martins talk
spring drinks