Almost have Query 6
Merge branch 'master' of github.com:aditirajagopal/eecs484

Conflicts:
	project2_ggong_araja/eecs484.project2/src/project2/TestFakebookOracle.java