slave mmap crash
Merge branch 'master' of https://github.com/yangarbiter/OS_projects

Conflicts:
	project2/slave.c