Micha wars!

* who_killed_kenny.txt
Merge branch 'master' of github.com:domnikl/test_git
Merge branch 'master' of github.com:domnikl/test_git