my first commit
Pull form the server. Merge branch 'master' of https://github.com/prognostik/try_git