create third merge
Merge branch 'thirdmerge'
Merge branch 'master' of https://github.com/neatpilot/trygit