Merge pull request #7 from szabgab/main

merge from Gabor
Tobias Leich - 2 talks on gpw 2014
Merge pull request #36 from EitanSchuler/master

Master