Kenny wars
Merge branch 'master' of github.com:domnikl/test_git