Please actually merge my changes
Merge https://github.com/tonbar/dsc

Conflicts:
	journal.txt
Merge https://github.com/ben-sanders/SCnowgen

Conflicts:
	journal.txt