-a
-a
Merge branch 'master' of https://github.com/zhulinchao/mip4

Conflicts:
	Assembler/Assembler.sdf
	Assembler/Assembler.v11.suo
	Assembler/Assembler/Debug/Assembler.log
	Assembler/Assembler/Debug/CL.read.1.tlog
	Assembler/Assembler/Debug/CL.write.1.tlog
	Assembler/Assembler/Debug/assemble.obj
	Assembler/Assembler/Debug/get_operand.obj
	Assembler/Assembler/Debug/grammar_check.obj
	Assembler/Assembler/Debug/instr_format.obj
	Assembler/Assembler/Debug/label_process.obj
	Assembler/Assembler/Debug/main.obj
	Assembler/Assembler/Debug/process_data_segment.obj
	Assembler/Assembler/Debug/public.obj
	Assembler/Assembler/Debug/reg_table.obj
	Assembler/Assembler/Debug/test.obj
	Assembler/Assembler/Debug/vc110.idb
	Assembler/Assembler/Debug/vc110.pdb
	Assembler/Assembler/assemble.c
	Assembler/Assembler/get_operand.c
	Assembler/Assembler/get_operand.h
	Assembler/Assembler/instr_format.c
	Assembler/Assembler/label_process.c
	Assembler/Assembler/mips_code/a.txt
	Assembler/Assembler/mips_code/a.txt.binary
	Assembler/Assembler/mips_code/a.txt.data
	Assembler/Assembler/mips_code/a.txt.debug_info
	Assembler/Assembler/mips_code/a.txt.obj
	Assembler/Assembler/process_data_segment.c
	Assembler/Assembler/public.c
	Assembler/Assembler/public.h
	Assembler/Debug/Assembler.exe
	Assembler/Debug/Assembler.ilk
	Assembler/Debug/Assembler.pdb
-a