2-12
--
Merge branch 'master' of https://github.com/erliangzi/Demo_For_Swift

Conflicts:
	.DS_Store