More test cases and move KNN_Naive
Merge branch 'master' of https://github.com/teamGaia/OneDrinkAway.git
Merge branch 'master' of https://github.com/teamGaia/OneDrinkAway.git

Conflicts:
	OneDrinkAway/src/com/onedrinkaway/test/TestSuite.java