resources
Merge branch 'master' of https://github.com/zoltan-fugedi/szarch-2014