pushed by accident

Signed-off-by: Mikolaj Szabo <savingprivateblue@gmail.com>
Merge branch 'master' of github.com:privateblue/vitrin