deleted:    src/test.c
	modified:   main.c
Merge branch 'master' of https://github.com/yishanhe/nvm-simulator

Conflicts:
	src/main.c
	src/test.c