increased max # of columns for ascii assembler
Merge branch 'master' into gui