testing github changed line 1

changed first line to say "change" midway through the comment
Merge branch 'master' of https://github.com/Lunaflare/Polaris

Conflicts:
	test_file.txt