michael to janet
fixed conflicts

Merge branch 'master' of https://github.com/prleary/swc_test_repo1

Conflicts:
	names.txt