不知道为什么我的电脑老是下载不了最新版本，，蛋蛋的忧伤，这次登入界面和注册又改了，也是最终确定版本了
Merge remote-tracking branch 'origin/master'

Conflicts:
	ReadMeNote/bin/classes/com/example/readmenote/R$drawable.class
	ReadMeNote/bin/classes/com/example/readmenote/R$id.class
	ReadMeNote/bin/classes/com/example/readmenote/R$layout.class
	ReadMeNote/gen/com/example/readmenote/R.java