test
Merge branch 'master' of https://github.com/bolenc/Git-Example
translated shakira
Merge pull request #6 from kaibot/master

Nickelback - Animal
Merge branch 'master' of https://github.com/bolenc/Git-Example