-rearranged file structure so as to conform to assignment requirements
-added averages for all metrics over all queries
Merge branch 'master' of https://github.com/11791-5/project-team5.git