20131215
Merge branch 'master' of https://github.com/tudouya/Learning-Record

Conflicts:
	杩戞湡璁″垝.txt