[ljubljana 2015] initial
Merge pull request #1379 from extraordinaire/2015-ljubljana

[ljubljana 2015] initial