ttttstsss
Merge branch 'master' of https://github.com/dedichow/bpsdm

Conflicts:
	tseting saja.txt