忽略myrest中bin下部分文件
Merge branch 'master' of github.com:LvanNeo/MyWorld

Conflicts:
	myrest/bin/classes/com/example/myrest/MainActivity$1.class
	myrest/bin/classes/com/example/myrest/MainActivity$2.class
	myrest/bin/classes/com/example/myrest/MainActivity$3.class
	myrest/bin/classes/com/example/myrest/MainActivity$4.class
	myrest/bin/classes/com/example/myrest/MainActivity$5.class
	myrest/bin/classes/com/example/myrest/MainActivity.class
	myrest/bin/classes/com/example/myrest/R$id.class
	myrest/bin/classes/com/example/myrest/R$layout.class
	myrest/bin/classes/com/example/myrest/R$menu.class
	myrest/bin/classes/com/example/myrest/R$string.class
	myrest/bin/classes/com/example/myrest/R$style.class