add comparator test
Merge branch 'master' of https://github.com/CMPUT301F14T06/Team06MapleSyrup

Conflicts:
	App/bin/App.apk
	App/bin/resources.ap_
	AppTest/bin/AppTest.apk
	AppTest/bin/classes.dex
	AppTest/bin/resources.ap_