More tests
Merge branch 'master' of github.com:stpddream/OSHomework

Conflicts:
	hw4/mem_taichi/main.c