Changed SWC2.txt for conflict resolution practice
Merge branch 'master' of https://github.com/TheaWhitman/SWC

Resolved the conflicting versions in one SWC2.txt document.

Conflicts:
	SWC2.txt