changed some text
Merge branch 'master' of github.com:jr0cket/jr0cket-git-workshop
changed tomas' file
Merge pull request #5 from feldoh/master

Pull request