commit to test merge conflicts
Merge remote-tracking branch 'origin/master'

Conflicts:
	persistent.sfs
test 4 ships
first attempt at automatically merging conflicts in saves