commit old
commit old
merge

Merge branch 'master' of https://github.com/slayerrensky/s0enow

Conflicts:
	datasync.txt