Summarized the plan of 2014-06-11.
Merge branch 'master' of https://github.com/rainbowCN/solution

Conflicts:
	plan/plan.txt