more more
Merge branch 'master' of https://github.com/gagolews/dsrtest
Merge branch 'master' of https://github.com/gagolews/dsrtest
Merge branch 'master' of https://github.com/gagolews/dsrtest

Conflicts:
	ryansfile.txt
Merge branch 'master' of https://github.com/gagolews/dsrtest