Populated choices.txt

Some scenes have special effects and require individual attention. The
ones I encountered while checking for branch convergence points have
been added as #TODO.
Merge remote-tracking branch 'origin/new-processed' into new-processed

Conflicts:
	6_English/strings_S005.MSD.rpy
	choices.txt
Merge remote-tracking branch 'origin/new-processed' into new-processed

Conflicts:
	7_English/strings_s006.MSD.rpy
	choices.txt