6
Merge branch 'master' of https://github.com/elenakaarina/SWC-test-repo

Conflicts:
	Elena.R