计算器和任务栏

计算器和任务栏
Merge branch 'master' of https://github.com/wangluyao/iPhone2014

Conflicts:
	21451085焦守杰/.DS_Store
	README.md
	yxb144325004祁陈斌/Project1/Project1/CalendarUtils.m