Summarized the plan of 2014-06-12.
Test conflict without line changing.
Merge branch 'master' of https://github.com/rainbowCN/solution

Conflicts:
	plan/git/conflict.txt
	plan/plan.txt