first edition# Please enter the commit message for your changes. Lines starting# with '#' will be ignored, and an empty message aborts the commit.## Author:    HonestManXin <HonestManXin@gmail.com>## On branch master# Changes to be committed:#   (use "git reset HEAD^1 <file>..." to unstage)##	new file:   docs/README.conflicts#	new file:   lab0/.config#	new file:   lab0/arrays#	new file:   lab0/arrays.c#	new file:   lab1/.config#	new file:   lab1/Makefile#	new file:   lab1/README#	new file:   lab1/bits.c#	new file:   lab1/bits.h#	new file:   lab1/btest#	new file:   lab1/btest.c#	new file:   lab1/btest.h#	new file:   lab1/decl.c#	new file:   lab1/dlc#	new file:   lab1/driver.pl#	new file:   lab1/fshow#	new file:   lab1/fshow.c#	new file:   lab1/ishow#	new file:   lab1/ishow.c#	new file:   lab1/pointer.c#	new file:   lab1/pointer.h#	new file:   lab1/ptest#	new file:   lab1/ptest.c#	new file:   lab1/tests.c#	new file:   lab2/.config#	new file:   lab2/Makefile#	new file:   lab2/asemmblycode#	new file:   lab2/bomb#	new file:   lab2/bomb.c#	new file:   lab2/defuser.txt#	new file:   lab2/instructions.pdf#	new file:   lab3/.config#	new file:   lab3/Makefile#	new file:   lab3/USERID#	new file:   lab3/ass.o#	new file:   lab3/ass.s#	new file:   lab3/assembly#	new file:   lab3/bang.txt#	new file:   lab3/bufbomb#	new file:   lab3/bufbomb.c#	new file:   lab3/dynamite.txt#	new file:   lab3/fizz.txt#	new file:   lab3/hacker.txt#	new file:   lab3/instructions.pdf#	new file:   lab3/makecookie#	new file:   lab3/sendstring#	new file:   lab3/smoke.txt#	new file:   lab3/test.o#	new file:   lab3/test.s#	new file:   lab4/.config#	new file:   lab4/Makefile#	new file:   lab4/cache-test#	new file:   lab4/cache-test-skel.c#	new file:   lab4/cache_16c_4a_4b.o#	new file:   lab4/cache_32c_8a_8b.o#	new file:   lab4/cache_64c_2a_16b.o#	new file:   lab4/check.awk#	new file:   lab4/check.sh#	new file:   lab4/instructions.pdf#	new file:   lab4/mystery-cache.h#	new file:   lab4/mystery0.o#	new file:   lab4/mystery1.o#	new file:   lab4/mystery2.o#	new file:   lab4/mystery3.o#	new file:   lab5/.config#	new file:   lab5/.mm.c.swp#	new file:   lab5/Makefile#	new file:   lab5/README#	new file:   lab5/clock.c#	new file:   lab5/clock.h#	new file:   lab5/clock.o#	new file:   lab5/config.h#	new file:   lab5/fcyc.c#	new file:   lab5/fcyc.h#	new file:   lab5/fcyc.o#	new file:   lab5/fsecs.c#	new file:   lab5/fsecs.h#	new file:   lab5/fsecs.o#	new file:   lab5/ftimer.c#	new file:   lab5/ftimer.h#	new file:   lab5/ftimer.o#	new file:   lab5/instructions.pdf#	new file:   lab5/mdriver#	new file:   lab5/mdriver.c#	new file:   lab5/mdriver.o#	new file:   lab5/memlib.c#	new file:   lab5/memlib.h#	new file:   lab5/memlib.o#	new file:   lab5/mm.c#	new file:   lab5/mm.h#	new file:   lab5/mm.o#	new file:   lab5/traces/amptjp-bal.rep#	new file:   lab5/traces/binary-bal.rep#	new file:   lab5/traces/binary2-bal.rep#	new file:   lab5/traces/cccp-bal.rep#	new file:   lab5/traces/coalescing-bal.rep#	new file:   lab5/traces/cp-decl-bal.rep#	new file:   lab5/traces/expr-bal.rep#	new file:   lab5/traces/random-bal.rep#	new file:   lab5/traces/random2-bal.rep#	new file:   lab5/traces/realloc-bal.rep#	new file:   lab5/traces/realloc2-bal.rep#	new file:   lab5/traces/short1-bal.rep#	new file:   lab5/traces/short2-bal.rep#	new file:   tools/submit-hw#	new file:   tools/update-course#
resolve readme.md conflict
Merge branch 'master' of https://github.com/HonestManXin/The-Hardware-Software-Interface-
delete some files