commit

Signed-off-by: starigazdam <starigazdam@gmail.com>
Merge branch 'master' of ssh://github.com/Starigazdam/PIS2014