新增备忘录
Merge branch 'master' of https://github.com/chen4342024/Plan

Conflicts:
	src/com/cc/activity/MainActivity.java
update memorandum