memory
wncomp config
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/compare/compose.py
wncomp config
wncomp config