Create README.md
Create README.md
Merge pull request #2 from Eageon/master

Create README.md
Merge pull request #1 from Blizzardking/master

stage1 merge2 - add function def in header file
Merge pull request #2 from Blizzardking/master

add inode.c
part of file operations completed
is this file
add Makefile
No *.swp
Merge branch 'master' of git@github.com:Blizzardking/FileSystem.git

Conflicts:
	block_operations.c
	inode_operation.c
Merge branch 'master' of git@github.com:Blizzardking/FileSystem.git

Conflicts:
	block_operations.c
	inode_operation.c
Merge pull request #4 from Eageon/master

merged