resolve
Update sb.txt
dsafsadfdsaffds
adfsadfsadfdsafdsa
change sbb
Merge branch 'master' of https://github.com/geniewang/eatopian
Merge pull request #6 from geniewang/GBranch

add some function to DAO
Merge branch 'master' of https://github.com/geniewang/eatopian
clean
Merge pull request #7 from geniewang/beta

Beta
Merge pull request #8 from geniewang/GBranch

add some function to DAO
Merge branch 'beta' into TBranch
Add getter & setter for class Dish. Finish similarity calculation for one dish.
Fix a typo in class Mongodb .
Add the text parser class DishParser for Dish. Add toString method to class Dish and make small changes.
fix
Merge branch 'beta' into GBranch

Conflicts:
	Farseer/src/com/eatopian/recommendation/Dish.java
	Farseer/src/com/eatopian/recommendation/Mongodb.java