Pulling
Merge branch 'master' of https://github.com/srang/devilFiler
Pulling
Merge branch 'master' of https://github.com/srang/devilFiler

Conflicts:
	src/common/DFileID.java
	src/dfs/LocalDFS.java
File size checks in DFS.read() and write()
Added BLOCK_ADDRESS_SIZE to constants
Merge branch 'master' of https://github.com/srang/devilFiler