Trying yo makenon conlficting changes on remote server
Merge branch 'master' of https://github.com/marcsit/swc_test_repo

Conflicts:
	names.txt