More people are doing things now.
Merge branch 'master' of https://github.com/dianalg/swc_test_repo

Conflicts:
	names.txt