unrelated new things
Merge branch 'master' of https://github.com/deparkes/swc

Conflicts:
	a.txt