Merge branch 'syscall' of https://github.com/nksprzak/Pintos into blake
STUFFFFF
Merge branch 'blake' of http://github.com/nksprzak/Pintos into syscall

Conflicts:
	src/userprog/syscall.c
about maybe halfway done with syscall.c , it fully compiles