now lets check conflict
Merge branch 'master' into gui

Conflicts:
	t.txt
commit
yhis is a pull request
Merge branch 'gui' of https://github.com/studentpra/gitgui.git into pullre