sohu
Merge branch 'master' of https://github.com/mahshidsedghi/cse511_project2

Conflicts:
	MetadataManager.cc