Merge branch 'master' of https://github.com/jedi4ever/devopsdays-webby
Merge branch 'master' of https://github.com/jedi4ever/devopsdays-webby
[ljubljana 2014] remove skeleton program, add info instead
Merge pull request #668 from extraordinaire/master

replace program with info