?
Merge branch 'master' of https://github.com/ruoyangwang/csc343-database

Conflicts:
	interview.xml~
finished q4.xq