dupa update
Merge branch 'master' of https://github.com/kstanski/mTest

Conflicts:
	dupa.txt