made change from another branch
change from master
Merge branch 'testing'

Conflicts:
	q.txt
Merge github.com:LDreptate/test

Conflicts:
	q.txt