ARCHS Update
Merge branch 'master' of https://github.com/CPDigitalDarkroom/CC-Deseparator

Conflicts:
	Makefile
Cont.