Jonathan got married! (And compromised on the spelling of his surname).
Merge branch 'master' of https://github.com/marcsit/swc_test_repo

Conflicts:
	names.txt