User and UserDao
.ds_store
trash
Merge branch 'YBranch' of https://github.com/geniewang/eatopian into GBranch

Conflicts:
	.DS_Store
	Eatopian/src/com/eatopian/entity/User.java
clean