65
Merge branch 'master' of https://github.com/snudler6/softwareDesignHW2

Conflicts:
	src/test/java/ac/il/technion/integration/times/QueryTimeTest.java