Update gitignore
Update gitignore
Change nfs_rpc_server's branch
Update Makefile