Added meta[cat/tag] and do_metarw in misc.c
Merge branch 'master' of https://github.com/ucsc-cs111-spr-2014/cs111-project-4

Conflicts:
	vfs/proto.h
	vfs/read.c