13.09.20——增加ignore文件
13.09.20——我也不知道我改了什么

。。。。。。。。
Merge branch 'master' of https://github.com/daydreamqian/BookExchangeMarket

Conflicts:
	bin/classes.dex
	bin/classes/com/vwdqproduction/bookexchangemarket/ChildFragment.class

bin/classes/com/vwdqproduction/bookexchangemarket/Fragment_booklist.clas
s

bin/classes/com/vwdqproduction/bookexchangemarket/GroupFragment$GroupAda
pter.class
	bin/classes/com/vwdqproduction/bookexchangemarket/GroupFragment.class
	bin/classes/com/vwdqproduction/bookexchangemarket/HostActivity.class
	bin/classes/com/vwdqproduction/bookexchangemarket/LoginActivity.class
	bin/classes/com/vwdqproduction/bookexchangemarket/MainActivity.class

bin/classes/com/vwdqproduction/bookexchangemarket/RecommendActivity.clas
s

bin/classes/com/vwdqproduction/bookexchangemarket/UserInfoActivity.class

bin/classes/com/vwdqproduction/bookexchangemarket/adapter/MenuListAdapte
r.class
	bin/resources.ap_