1.����20140829�Ļ�ּ�¼
1.������Ѷ�ͷ���¼
Merge branch 'master' of https://github.com/chucklu/Drifter

Conflicts:
	2014/08/ÌÚÑ¶¿Í·þ.txt