com changed the html nonsense
Merge remote-tracking branch 'origin/master'

Conflicts:
	ALU/_xmsgs/pn_parser.xmsgs
	ALU/alu_summary.html
	ALU/iseconfig/alu.xreport
joey branch created
Merge branch 'Ray' of https://github.com/CG3207/CG3207 into Ray

Conflicts:
	ALU/_xmsgs/pn_parser.xmsgs