rebase git bash
Merge branch 'master' of github.com:LDreptate/test

Conflicts:
	q.txt